Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bitlbee-discord for openSUSE:Factory
checked in at 2021-10-04 18:40:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bitlbee-discord (Old)
and /work/SRC/openSUSE:Factory/.bitlbee-discord.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bitlbee-discord"
Mon Oct 4 18:40:48 2021 rev:5 rq:923045 version:0.4.3+7.g607f988
Changes:
--------
--- /work/SRC/openSUSE:Factory/bitlbee-discord/bitlbee-discord.changes
2020-04-11 23:46:52.951104547 +0200
+++
/work/SRC/openSUSE:Factory/.bitlbee-discord.new.2443/bitlbee-discord.changes
2021-10-04 18:42:39.122319418 +0200
@@ -1,0 +2,16 @@
+Mon Oct 04 14:08:12 UTC 2021 - [email protected]
+
+- Update to version 0.4.3+7.g607f988:
+ * Fix empty gateway->path with glib > 2.68
+ * Additional debuginfo on websocket upgrade
+
+-------------------------------------------------------------------
+Thu Sep 09 17:52:09 UTC 2021 - [email protected]
+
+- Update to version 0.4.3+5.g068ed17:
+ * Basic implementation of discord's replies
+ * Update README.md
+ * Update and rename README to README.md
+ * Add verbosity toggle
+
+-------------------------------------------------------------------
Old:
----
bitlbee-discord-0.4.3+0.g9466079.obscpio
New:
----
bitlbee-discord-0.4.3+7.g607f988.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bitlbee-discord.spec ++++++
--- /var/tmp/diff_new_pack.SKngRX/_old 2021-10-04 18:42:39.610320211 +0200
+++ /var/tmp/diff_new_pack.SKngRX/_new 2021-10-04 18:42:39.614320217 +0200
@@ -1,7 +1,7 @@
#
# spec file for package bitlbee-discord
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: bitlbee-discord
-Version: 0.4.3+0.g9466079
+Version: 0.4.3+7.g607f988
Release: 0
Summary: Bitlbee plugin for Discord
License: GPL-2.0-only
@@ -46,7 +46,7 @@
%files
%license LICENSE
-%doc README
+%doc README.md
%dir %{_libdir}/bitlbee
%{_libdir}/bitlbee/discord.so
%{_datadir}/bitlbee/discord-help.txt
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.SKngRX/_old 2021-10-04 18:42:39.654320283 +0200
+++ /var/tmp/diff_new_pack.SKngRX/_new 2021-10-04 18:42:39.654320283 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/sm00th/bitlbee-discord.git</param>
- <param
name="changesrevision">9466079361c49639cef7cc2eb54dba94544be307</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">607f9887ca85f246e970778e3d40aa5c346365a7</param></service></servicedata>
\ No newline at end of file
++++++ bitlbee-discord-0.4.3+0.g9466079.obscpio ->
bitlbee-discord-0.4.3+7.g607f988.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bitlbee-discord-0.4.3+0.g9466079/.git/FETCH_HEAD
new/bitlbee-discord-0.4.3+7.g607f988/.git/FETCH_HEAD
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/FETCH_HEAD 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/FETCH_HEAD 2021-09-28
18:38:48.000000000 +0200
@@ -1 +1,2 @@
-9466079361c49639cef7cc2eb54dba94544be307 branch 'master' of
https://github.com/sm00th/bitlbee-discord
+607f9887ca85f246e970778e3d40aa5c346365a7 branch 'master' of
https://github.com/sm00th/bitlbee-discord
+068ed17a752d82ffc5cb075349df6fc20831b462 not-for-merge branch
'replies' of https://github.com/sm00th/bitlbee-discord
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bitlbee-discord-0.4.3+0.g9466079/.git/ORIG_HEAD
new/bitlbee-discord-0.4.3+7.g607f988/.git/ORIG_HEAD
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/ORIG_HEAD 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/ORIG_HEAD 2021-09-28
18:38:48.000000000 +0200
@@ -1 +1 @@
-9466079361c49639cef7cc2eb54dba94544be307
+607f9887ca85f246e970778e3d40aa5c346365a7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/fsmonitor-watchman.sample
new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/fsmonitor-watchman.sample
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/fsmonitor-watchman.sample
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/fsmonitor-watchman.sample
2021-09-28 18:38:48.000000000 +0200
@@ -8,102 +8,166 @@
# (https://facebook.github.io/watchman/) with git to speed up detecting
# new and modified files.
#
-# The hook is passed a version (currently 1) and a time in nanoseconds
-# formatted as a string and outputs to stdout all files that have been
-# modified since the given time. Paths must be relative to the root of
-# the working tree and separated by a single NUL.
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
#
# To enable this hook, rename this file to "query-watchman" and set
# 'git config core.fsmonitor .git/hooks/query-watchman'
#
-my ($version, $time) = @ARGV;
+my ($version, $last_update_token) = @ARGV;
-# Check the hook interface version
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
-if ($version == 1) {
- # convert nanoseconds to seconds
- # subtract one second to make sure watchman will return all changes
- $time = int ($time / 1000000000) - 1;
-} else {
+# Check the hook interface version
+if ($version ne 2) {
die "Unsupported query-fsmonitor hook version '$version'.\n" .
"Falling back to scanning...\n";
}
-my $git_work_tree;
-if ($^O =~ 'msys' || $^O =~ 'cygwin') {
- $git_work_tree = Win32::GetCwd();
- $git_work_tree =~ tr/\\/\//;
-} else {
- require Cwd;
- $git_work_tree = Cwd::cwd();
-}
+my $git_work_tree = get_working_dir();
my $retry = 1;
+my $json_pkg;
+eval {
+ require JSON::XS;
+ $json_pkg = "JSON::XS";
+ 1;
+} or do {
+ require JSON::PP;
+ $json_pkg = "JSON::PP";
+};
+
launch_watchman();
sub launch_watchman {
+ my $o = watchman_query();
+ if (is_work_tree_watched($o)) {
+ output_result($o->{clock}, @{$o->{files}});
+ }
+}
+
+sub output_result {
+ my ($clockid, @files) = @_;
+
+ # Uncomment for debugging watchman output
+ # open (my $fh, ">", ".git/watchman-output.out");
+ # binmode $fh, ":utf8";
+ # print $fh "$clockid\n@files\n";
+ # close $fh;
+ binmode STDOUT, ":utf8";
+ print $clockid;
+ print "\0";
+ local $, = "\0";
+ print @files;
+}
+
+sub watchman_clock {
+ my $response = qx/watchman clock "$git_work_tree"/;
+ die "Failed to get clock id on '$git_work_tree'.\n" .
+ "Falling back to scanning...\n" if $? != 0;
+
+ return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
- or die "open2() failed: $!\n" .
- "Falling back to scanning...\n";
+ or die "open2() failed: $!\n" .
+ "Falling back to scanning...\n";
# In the query expression below we're asking for names of files that
- # changed since $time but were not transient (ie created after
- # $time but no longer exist).
+ # changed since $last_update_token but not from the .git folder.
#
# To accomplish this, we're using the "since" generator to use the
# recency index to select candidate nodes and "fields" to limit the
- # output to file names only.
-
+ # output to file names only. Then we're using the "expression" term to
+ # further constrain the results.
+ if (substr($last_update_token, 0, 1) eq "c") {
+ $last_update_token = "\"$last_update_token\"";
+ }
my $query = <<" END";
["query", "$git_work_tree", {
- "since": $time,
- "fields": ["name"]
+ "since": $last_update_token,
+ "fields": ["name"],
+ "expression": ["not", ["dirname", ".git"]]
}]
END
+ # Uncomment for debugging the watchman query
+ # open (my $fh, ">", ".git/watchman-query.json");
+ # print $fh $query;
+ # close $fh;
+
print CHLD_IN $query;
close CHLD_IN;
my $response = do {local $/; <CHLD_OUT>};
+ # Uncomment for debugging the watch response
+ # open ($fh, ">", ".git/watchman-response.json");
+ # print $fh $response;
+ # close $fh;
+
die "Watchman: command returned no output.\n" .
- "Falling back to scanning...\n" if $response eq "";
+ "Falling back to scanning...\n" if $response eq "";
die "Watchman: command returned invalid output: $response\n" .
- "Falling back to scanning...\n" unless $response =~ /^\{/;
+ "Falling back to scanning...\n" unless $response =~ /^\{/;
- my $json_pkg;
- eval {
- require JSON::XS;
- $json_pkg = "JSON::XS";
- 1;
- } or do {
- require JSON::PP;
- $json_pkg = "JSON::PP";
- };
-
- my $o = $json_pkg->new->utf8->decode($response);
+ return $json_pkg->new->utf8->decode($response);
+}
- if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve
root .* directory (.*) is not watched/) {
- print STDERR "Adding '$git_work_tree' to watchman's watch
list.\n";
+sub is_work_tree_watched {
+ my ($output) = @_;
+ my $error = $output->{error};
+ if ($retry > 0 and $error and $error =~ m/unable to resolve root .*
directory (.*) is not watched/) {
$retry--;
- qx/watchman watch "$git_work_tree"/;
+ my $response = qx/watchman watch "$git_work_tree"/;
die "Failed to make watchman watch '$git_work_tree'.\n" .
"Falling back to scanning...\n" if $? != 0;
+ $output = $json_pkg->new->utf8->decode($response);
+ $error = $output->{error};
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
+
+ # Uncomment for debugging watchman output
+ # open (my $fh, ">", ".git/watchman-output.out");
+ # close $fh;
# Watchman will always return all files on the first query so
# return the fast "everything is dirty" flag to git and do the
# Watchman query just to get it over with now so we won't pay
# the cost in git to look up each individual file.
- print "/\0";
+ my $o = watchman_clock();
+ $error = $output->{error};
+
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
+
+ output_result($o->{clock}, ("/"));
+ $last_update_token = $o->{clock};
+
eval { launch_watchman() };
- exit 0;
+ return 0;
}
- die "Watchman: $o->{error}.\n" .
- "Falling back to scanning...\n" if $o->{error};
+ die "Watchman: $error.\n" .
+ "Falling back to scanning...\n" if $error;
- binmode STDOUT, ":utf8";
- local $, = "\0";
- print @{$o->{files}};
+ return 1;
+}
+
+sub get_working_dir {
+ my $working_dir;
+ if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+ $working_dir = Win32::GetCwd();
+ $working_dir =~ tr/\\/\//;
+ } else {
+ require Cwd;
+ $working_dir = Cwd::cwd();
+ }
+
+ return $working_dir;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/pre-commit.sample
new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/pre-commit.sample
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/pre-commit.sample
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/pre-commit.sample
2021-09-28 18:38:48.000000000 +0200
@@ -16,7 +16,7 @@
fi
# If you want to allow non-ASCII filenames set this variable to true.
-allownonascii=$(git config --bool hooks.allownonascii)
+allownonascii=$(git config --type=bool hooks.allownonascii)
# Redirect output to stderr.
exec 1>&2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/pre-push.sample
new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/pre-push.sample
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/pre-push.sample
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/pre-push.sample
2021-09-28 18:38:48.000000000 +0200
@@ -14,7 +14,7 @@
# Information about the commits which are being pushed is supplied as lines to
# the standard input in the form:
#
-# <local ref> <local sha1> <remote ref> <remote sha1>
+# <local ref> <local oid> <remote ref> <remote oid>
#
# This sample shows how to prevent push of commits where the log message starts
# with "WIP" (work in progress).
@@ -22,27 +22,27 @@
remote="$1"
url="$2"
-z40=0000000000000000000000000000000000000000
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
-while read local_ref local_sha remote_ref remote_sha
+while read local_ref local_oid remote_ref remote_oid
do
- if [ "$local_sha" = $z40 ]
+ if test "$local_oid" = "$zero"
then
# Handle delete
:
else
- if [ "$remote_sha" = $z40 ]
+ if test "$remote_oid" = "$zero"
then
# New branch, examine all commits
- range="$local_sha"
+ range="$local_oid"
else
# Update to existing branch, examine new commits
- range="$remote_sha..$local_sha"
+ range="$remote_oid..$local_oid"
fi
# Check for WIP commit
- commit=`git rev-list -n 1 --grep '^WIP' "$range"`
- if [ -n "$commit" ]
+ commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+ if test -n "$commit"
then
echo >&2 "Found WIP commit in $local_ref, not pushing"
exit 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/push-to-checkout.sample
new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/push-to-checkout.sample
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/push-to-checkout.sample
1970-01-01 01:00:00.000000000 +0100
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/push-to-checkout.sample
2021-09-28 18:38:48.000000000 +0200
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+ echo >&2 "$*"
+ exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+ die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+ die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+ head=HEAD
+else
+ head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+ die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+ die "Could not update working tree to new HEAD"
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/update.sample
new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/update.sample
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/hooks/update.sample
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/hooks/update.sample
2021-09-28 18:38:48.000000000 +0200
@@ -43,11 +43,11 @@
fi
# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
# check for no description
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
@@ -60,7 +60,7 @@
# --- Check types
# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
if [ "$newrev" = "$zero" ]; then
newrev_type=delete
else
Binary files old/bitlbee-discord-0.4.3+0.g9466079/.git/index and
new/bitlbee-discord-0.4.3+7.g607f988/.git/index differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bitlbee-discord-0.4.3+0.g9466079/.git/logs/HEAD
new/bitlbee-discord-0.4.3+7.g607f988/.git/logs/HEAD
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/logs/HEAD 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/logs/HEAD 2021-09-28
18:38:48.000000000 +0200
@@ -1,6 +1,3 @@
-0000000000000000000000000000000000000000
69e16be9d1d427e9bb085eabb9e4caecaa97dfc6 Martin Herkt <[email protected]>
1581436258 +0100 clone: from https://github.com/sm00th/bitlbee-discord.git
-69e16be9d1d427e9bb085eabb9e4caecaa97dfc6
69e16be9d1d427e9bb085eabb9e4caecaa97dfc6 Martin Herkt <[email protected]>
1581436258 +0100 reset: moving to master
-69e16be9d1d427e9bb085eabb9e4caecaa97dfc6
69e16be9d1d427e9bb085eabb9e4caecaa97dfc6 Martin Herkt <[email protected]>
1581436280 +0100 reset: moving to master
-69e16be9d1d427e9bb085eabb9e4caecaa97dfc6
69e16be9d1d427e9bb085eabb9e4caecaa97dfc6 Martin Herkt <[email protected]>
1581437839 +0100 reset: moving to master
-69e16be9d1d427e9bb085eabb9e4caecaa97dfc6
9466079361c49639cef7cc2eb54dba94544be307 Martin Herkt <[email protected]>
1586541226 +0200 merge refs/remotes/origin/master: Fast-forward
-9466079361c49639cef7cc2eb54dba94544be307
9466079361c49639cef7cc2eb54dba94544be307 Martin Herkt <[email protected]>
1586541226 +0200 reset: moving to master
+0000000000000000000000000000000000000000
068ed17a752d82ffc5cb075349df6fc20831b462 Mia Herkt <[email protected]> 1631209929
+0200 clone: from https://github.com/sm00th/bitlbee-discord.git
+068ed17a752d82ffc5cb075349df6fc20831b462
607f9887ca85f246e970778e3d40aa5c346365a7 Mia Herkt <[email protected]> 1633356492
+0200 merge origin/master: Fast-forward
+607f9887ca85f246e970778e3d40aa5c346365a7
607f9887ca85f246e970778e3d40aa5c346365a7 Mia Herkt <[email protected]> 1633356492
+0200 reset: moving to master
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/logs/refs/heads/master
new/bitlbee-discord-0.4.3+7.g607f988/.git/logs/refs/heads/master
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/logs/refs/heads/master
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/logs/refs/heads/master
2021-09-28 18:38:48.000000000 +0200
@@ -1,2 +1,2 @@
-0000000000000000000000000000000000000000
69e16be9d1d427e9bb085eabb9e4caecaa97dfc6 Martin Herkt <[email protected]>
1581436258 +0100 clone: from https://github.com/sm00th/bitlbee-discord.git
-69e16be9d1d427e9bb085eabb9e4caecaa97dfc6
9466079361c49639cef7cc2eb54dba94544be307 Martin Herkt <[email protected]>
1586541226 +0200 merge refs/remotes/origin/master: Fast-forward
+0000000000000000000000000000000000000000
068ed17a752d82ffc5cb075349df6fc20831b462 Mia Herkt <[email protected]> 1631209929
+0200 clone: from https://github.com/sm00th/bitlbee-discord.git
+068ed17a752d82ffc5cb075349df6fc20831b462
607f9887ca85f246e970778e3d40aa5c346365a7 Mia Herkt <[email protected]> 1633356492
+0200 merge origin/master: Fast-forward
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/logs/refs/remotes/origin/HEAD
new/bitlbee-discord-0.4.3+7.g607f988/.git/logs/refs/remotes/origin/HEAD
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/logs/refs/remotes/origin/HEAD
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/logs/refs/remotes/origin/HEAD
2021-09-28 18:38:48.000000000 +0200
@@ -1 +1 @@
-0000000000000000000000000000000000000000
69e16be9d1d427e9bb085eabb9e4caecaa97dfc6 Martin Herkt <[email protected]>
1581436258 +0100 clone: from https://github.com/sm00th/bitlbee-discord.git
+0000000000000000000000000000000000000000
068ed17a752d82ffc5cb075349df6fc20831b462 Mia Herkt <[email protected]> 1631209929
+0200 clone: from https://github.com/sm00th/bitlbee-discord.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/logs/refs/remotes/origin/master
new/bitlbee-discord-0.4.3+7.g607f988/.git/logs/refs/remotes/origin/master
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/logs/refs/remotes/origin/master
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/logs/refs/remotes/origin/master
2021-09-28 18:38:48.000000000 +0200
@@ -1 +1 @@
-69e16be9d1d427e9bb085eabb9e4caecaa97dfc6
9466079361c49639cef7cc2eb54dba94544be307 Martin Herkt <[email protected]>
1586541225 +0200 fetch --tags: fast-forward
+068ed17a752d82ffc5cb075349df6fc20831b462
607f9887ca85f246e970778e3d40aa5c346365a7 Mia Herkt <[email protected]> 1633356492
+0200 fetch --tags: fast-forward
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/11/fc43e4dc6ea131f06c1724a74b0441ca55ee38
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/11/fc43e4dc6ea131f06c1724a74b0441ca55ee38
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/26/ae85dc4da48876d94dda31ca5c2a6caaec133e
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/26/ae85dc4da48876d94dda31ca5c2a6caaec133e
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/30/61edd283b4e886384e5e8cad10f92dc45f3ee7
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/30/61edd283b4e886384e5e8cad10f92dc45f3ee7
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/37/2a344ede1610ab0c048b4fbc34160e8919e190
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/37/2a344ede1610ab0c048b4fbc34160e8919e190
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/45/794288e84463070d168f3e2cb71301c6d862f9
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/45/794288e84463070d168f3e2cb71301c6d862f9
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/60/7f9887ca85f246e970778e3d40aa5c346365a7
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/60/7f9887ca85f246e970778e3d40aa5c346365a7
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/66/a6d5ab45df5bc1ae1bad0239df64489ee21b8c
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/66/a6d5ab45df5bc1ae1bad0239df64489ee21b8c
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/7f/35c3fa7734b5b15d7945353646b6ead4ad6177
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/7f/35c3fa7734b5b15d7945353646b6ead4ad6177
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/80/b3946f500d034f720c90b75298b0f21f105daf
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/80/b3946f500d034f720c90b75298b0f21f105daf
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/94/66079361c49639cef7cc2eb54dba94544be307
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/94/66079361c49639cef7cc2eb54dba94544be307
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/94/73bf05513d403a772573bb87b63e9ff974bc78
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/94/73bf05513d403a772573bb87b63e9ff974bc78
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/97/897788dfa2f0d13edd9f05851bb259dda9e094
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/97/897788dfa2f0d13edd9f05851bb259dda9e094
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/a1/20a84e0fdc0b56d1ce9ec5fdd646c45741d12e
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/a1/20a84e0fdc0b56d1ce9ec5fdd646c45741d12e
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/af/b729d51e120862626918aa20ad54990b857692
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/af/b729d51e120862626918aa20ad54990b857692
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/eb/768b4a81de02eb1eb952da6ac52e159f4b1623
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/eb/768b4a81de02eb1eb952da6ac52e159f4b1623
---
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/eb/768b4a81de02eb1eb952da6ac52e159f4b1623
1970-01-01 01:00:00.000000000 +0100
+++
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/eb/768b4a81de02eb1eb952da6ac52e159f4b1623
2021-09-28 18:38:48.000000000 +0200
@@ -0,0 +1 @@
+x??AN?0EY?_b?Q%v??!z??`b??I\l???
v,??????m\?P?iuW3?&6???????v??9R???J???m?? %^
m??{?????????{? ??????v????)& S?'???/?????n???qyE??4??^???M#??Z,?X ? X ?
%??f8 ?1?>"?????=s?v9??????2;??Rj??#d??|??1n?LX?V-?sp??+?w?j?p?rA??[B???s????RE??5?????y?Bg?G?:f??k?i'?)???S??i?x?;G?
M???
\ No newline at end of file
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/pack/pack-08e72372be5b67d5e0636612c18179ace036ff4d.idx
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/pack/pack-08e72372be5b67d5e0636612c18179ace036ff4d.idx
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/pack/pack-08e72372be5b67d5e0636612c18179ace036ff4d.pack
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/pack/pack-08e72372be5b67d5e0636612c18179ace036ff4d.pack
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/pack/pack-d32982b343c0f5405bd8e0447d809b9fbbfb13b0.idx
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/pack/pack-d32982b343c0f5405bd8e0447d809b9fbbfb13b0.idx
differ
Binary files
old/bitlbee-discord-0.4.3+0.g9466079/.git/objects/pack/pack-d32982b343c0f5405bd8e0447d809b9fbbfb13b0.pack
and
new/bitlbee-discord-0.4.3+7.g607f988/.git/objects/pack/pack-d32982b343c0f5405bd8e0447d809b9fbbfb13b0.pack
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bitlbee-discord-0.4.3+0.g9466079/.git/packed-refs
new/bitlbee-discord-0.4.3+7.g607f988/.git/packed-refs
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/packed-refs 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/packed-refs 2021-09-28
18:38:48.000000000 +0200
@@ -1,4 +1,6 @@
# pack-refs with: peeled fully-peeled sorted
-69e16be9d1d427e9bb085eabb9e4caecaa97dfc6 refs/remotes/origin/master
+068ed17a752d82ffc5cb075349df6fc20831b462 refs/remotes/origin/master
+068ed17a752d82ffc5cb075349df6fc20831b462 refs/remotes/origin/replies
3e435b0c6b24d57766d52c12d0fab5f69068c1ef refs/tags/0.4.1
aa0bbf2df851b1fd1b27164713121d20c610b7c5 refs/tags/0.4.2
+9466079361c49639cef7cc2eb54dba94544be307 refs/tags/0.4.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/refs/heads/master
new/bitlbee-discord-0.4.3+7.g607f988/.git/refs/heads/master
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/refs/heads/master 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/refs/heads/master 2021-09-28
18:38:48.000000000 +0200
@@ -1 +1 @@
-9466079361c49639cef7cc2eb54dba94544be307
+607f9887ca85f246e970778e3d40aa5c346365a7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/refs/remotes/origin/master
new/bitlbee-discord-0.4.3+7.g607f988/.git/refs/remotes/origin/master
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/refs/remotes/origin/master
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/refs/remotes/origin/master
2021-09-28 18:38:48.000000000 +0200
@@ -1 +1 @@
-9466079361c49639cef7cc2eb54dba94544be307
+607f9887ca85f246e970778e3d40aa5c346365a7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/.git/refs/tags/0.4.3
new/bitlbee-discord-0.4.3+7.g607f988/.git/refs/tags/0.4.3
--- old/bitlbee-discord-0.4.3+0.g9466079/.git/refs/tags/0.4.3 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/.git/refs/tags/0.4.3 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9466079361c49639cef7cc2eb54dba94544be307
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bitlbee-discord-0.4.3+0.g9466079/README
new/bitlbee-discord-0.4.3+7.g607f988/README
--- old/bitlbee-discord-0.4.3+0.g9466079/README 2020-03-31 22:20:38.000000000
+0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/README 1970-01-01 01:00:00.000000000
+0100
@@ -1,209 +0,0 @@
-Discord protocol plugin for bitlbee.
-
-License
--------
-bitlbee-discord plugin is distributed under GPLv2 license.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Build dependencies
-------------------
-- bitlbee and headers >= 3.5
- If using distribution version of bitlbee you will need to install the dev
- package, usually bitlbee-dev or bitlbee-devel. If bitlbee was built from
- source don't forget to do `make install-dev`.
-
-- glib2 and headers => 2.32
- The library itself is usually installed as a dependency of bitlbee, headers
- need to be installed separately. In Debian, the package containing them is
- libglib2.0-dev.
-
-- autotools (if building from git)
- A bit of an overkill, but autotools is the build system of choice now, sorry.
-
-
-Building and Installing
------------------------
-If building from git you will first need to generate autotools configuration
-script and related files by executing the following command:
-
- $ ./autogen.sh
-
-After that (or when building from a tarball) you can build as usual:
-
- $ ./configure
- $ make
- $ sudo make install
-
-If your bitlbee's plugindir is in non-standard location you can specify it by
-calling ./configure with --with-plugindir=/path/to/plugindir option.
-
-You can also use the dockerfile from contrib/docker to build a docker container
-containing bitlbee + bitlbee-discord. Use this command to run the container:
-
- $ docker run -d -v /bitlbee/config:/var/lib/bitlbee -p 6667:6667 --name
bitlbee <image>
-
-Usage
------
-Plugin adds 'discord' protocol to bitlbee, add your account as usual:
-
- > account add discord <email> <password>
- > account discord on
-
-On your first login you might need to authorize bitlbee's ip address
-(discord will send you an email with a link) or get a captcha-request. In
-latter case you will have to manually set discord login-token to log in:
-
- > account discord off
- > acc discord set token_cache xxxxxxxx
-
-To get your token you'll have to login with your browser and locate it in
-"local storage"
-
-Chrome: Developer Tools -> Application -> Local Storage ->
https://discordapp.com -> token
-Firefox: Web Developer -> Storage Inspector -> Local Storage ->
http://discordapp.com -> token
-
-For more info on captcha issue and any progress on making it less painful see
-https://github.com/sm00th/bitlbee-discord/issues/118
-
-You also need to configure discord channels you would like to join/autojoin. To
-do that use bitlbee's 'chat list' functionality (`help chat list` and `help
-chat add`):
- > chat list discord
-
-This will show you the list of available channel with indexes that can be used
-for adding channels.
-
- > chat add discord !1 #mydiscordchannel
- > chan #mydiscordchannel set auto_join true
- > /join #mydiscordchannel
-
-If you set auto_join to true, next time you reconnect there will be no need to
-join the channel manually.
-
-Options
--------
-This section describes options available through "account set" bitlbee command
-(for help on usage of this command see "help account set").
-
- - host (type: string; default: "discordapp.com")
- Discord server hostname. Just in case discord changes the hostname or there
- are some alternatives with compatible API.
-
- - voice_status_notify (type: boolean; default: no)
- This enables text notifications in your control channel about users
- changing/leaving voice channels. Can be noisy on big servers.
-
- - edit_prefix (type: string; default: "EDIT: ")
- A string that will be prefixed to an edited message to distinguish those
- from normal ones.
-
- - urlinfo_handle (type: string; default: "urlinfo")
- User handle that will be used to post url expansion info such as title and
- description in groupchats.
-
- - max_backlog (type: integer; default: 50)
- Maximum number of backlog messages per channel to fetch on connection.
- Unlike twitter implementation in bitlbee this won't dump seen messages.
- Setting this to 0 or negative values disables backlog fetching.
-
- - send_acks (type: boolean; default: yes)
- By default bitlbee-discord will send an "ack" for every message received,
- thus marking everything as "read" on mobile/webapp. Setting this to false
- will disable all acks from bitlbee-discord.
-
- - mention_suffix (type: string; default: ":")
- Suffix used in a regex to look for username mentions to automatically
- convert your usual irc-style "nick:" mentions to discord's "<@id>" format.
- So if you type "nick: hello" in bitlbee, it will be displayed as
- "@nick hello" in discord. This can be multicharacter and you can even do OR
- logic here because it is actually used as a part of glib regex. That is
- setting this to "[:,]" will match both "nick:" and "nick,". But beware
- overcomplicating this may lead to bitlbee-discord spending a lot of time
- parsing your outgoing messages. Setting this to "" will disable this
- function.
-
- - mention_ignorecase (type: boolean; default: off)
- Ignore case when looking for outgoing mentions. This also affects channel
- mentions.
-
- - incoming_me_translation (type: boolean; default: on)
- This option controls whether bitlbee-discord will translate incoming
- messages that are fully italicized (that is enclosed in '*' characters) to
- '/me' messages.
-
- - never_offline (type: boolean; default: off)
- Contacts from this account will never appear as offline and will be marked
- away instead.
-
- - server_prefix_len (type: int; default: 3)
- Prefix channel names with this many characters of server name. If set to 0
- nothing will be prefixed. If set to anything lower than 0 - full server
- name will be prefixed. Assuming we have a channel "general" on "beecord"
- server here is what channel name you are going to get with different
- settings:
- -1 - #beecord.general
- 0 - #general
- 3 - #bee.general
-
- - fetch_pinned (type: boolean; default: off)
- Fetch pinned messages on channel join.
-
- - friendship_mode (type: boolean; default: on)
- With this option enabled, online/offline status is determined by the
- friendship relationship with a user in addition to their actual away
- status, and other users are added to channels.
-
- - always_afk (type: boolean; default: off)
- When enabled bitlbee-discord would always report client's status as afk.
- This feature is not properly documented in official docs, but it presumably
- can force push notifications to other clients when bitlbee is connected.
-
- - emoji_urls (type: boolean; default: on)
- Controls whether bitlbee-discord would display an url to emoji image next
- to it's text alias.
-
- - auto_join (type: boolean; default: off)
- Automatically join all of the server's channels so you don't have to add
- them manually (no "chat add" needed).
-
- - auto_join_exclude (type: string; default: "")
- Comma-separated list of channel patterns to exclude when auto-joining
- channels. * matches any text, ? matches a single character. For instance,
- "Foo.*,Bar.A" will exclude all channels from server "Foo" and channel "A"
- from server "Bar".
-
-Debugging
----------
-You can enable extra debug output for bitlbee-discord, by setting BITLBEE_DEBUG
-environment variable. This will enable bitlbee-discord to print all traffic it
-exchanges with discord servers to stdout and there is a lot of it. To get it
-on your screen run bitlbee by hand in foreground mode:
- $ BITLBEE_DEBUG=1 bitlbee -nvD
-then connect with an irc client as you usually do.
-
-WARNING: there IS sensitive information in this debug output, such as auth
-tokens, your plaintext password and, obviously, your incoming and outgoing
-messages. Be sure to remove any information you are not willing to share before
-posting it anywhere.
-
-If you are experiencing crashes please refer to this page for information on
-how to get a meaningful backtrace: https://wiki.bitlbee.org/DebuggingCrashes
-
-Bugs
-----
-Please report bugs at github: https://github.com/sm00th/bitlbee-discord/issues
-For questions, bitlbee-discord breakage demonstrations and chitchat you can
-join the following discord server: https://discord.gg/0lUXEAZXmvW3ovUC or ping
-trac3r on irc.oftc.net/#bitlbee (irc is preferable).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bitlbee-discord-0.4.3+0.g9466079/README.md
new/bitlbee-discord-0.4.3+7.g607f988/README.md
--- old/bitlbee-discord-0.4.3+0.g9466079/README.md 1970-01-01
01:00:00.000000000 +0100
+++ new/bitlbee-discord-0.4.3+7.g607f988/README.md 2021-09-28
18:38:48.000000000 +0200
@@ -0,0 +1,238 @@
+Discord protocol plugin for bitlbee.
+====================================
+
+License
+-------
+bitlbee-discord plugin is distributed under GPLv2 license.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Build dependencies
+------------------
+#### bitlbee and headers >= 3.5
+
+If using distribution version of bitlbee you will need to install the dev
+package, usually bitlbee-dev or bitlbee-devel. If bitlbee was built from
+source don't forget to do `make install-dev`.
+
+#### glib2 and headers => 2.32
+
+The library itself is usually installed as a dependency of bitlbee, headers
+need to be installed separately. In Debian, the package containing them is
+libglib2.0-dev.
+
+#### autotools (if building from git)
+
+A bit of an overkill, but autotools is the build system of choice now, sorry.
+
+
+Building and Installing
+-----------------------
+If building from git you will first need to generate autotools configuration
+script and related files by executing the following command:
+
+ $ ./autogen.sh
+
+After that (or when building from a tarball) you can build as usual:
+
+ $ ./configure
+ $ make
+ $ sudo make install
+
+If your bitlbee's plugindir is in non-standard location you can specify it by
+calling `./configure` with `--with-plugindir=/path/to/plugindir` option.
+
+You can also use the dockerfile from contrib/docker to build a docker container
+containing bitlbee + bitlbee-discord. Use this command to run the container:
+
+ $ docker run -d -v /bitlbee/config:/var/lib/bitlbee -p 6667:6667 --name
bitlbee <image>
+
+Usage
+-----
+Plugin adds 'discord' protocol to bitlbee, add your account as usual:
+
+ > account add discord <email> <password>
+ > account discord on
+
+On your first login you might need to authorize bitlbee's ip address
+(discord will send you an email with a link) or get a captcha-request. In
+latter case you will have to manually set discord login-token to log in:
+
+ > account discord off
+ > acc discord set token_cache xxxxxxxx
+
+To get your token you'll have to login with your browser and locate it in
+"local storage"
+
+Chrome: Developer Tools -> Application -> Local Storage ->
https://discordapp.com -> token
+Firefox: Web Developer -> Storage Inspector -> Local Storage ->
http://discordapp.com -> token
+
+For more info on captcha issue and any progress on making it less painful see
+https://github.com/sm00th/bitlbee-discord/issues/118
+
+You also need to configure discord channels you would like to join/autojoin. To
+do that use bitlbee's 'chat list' functionality (`help chat list` and `help
+chat add`):
+
+ > chat list discord
+
+This will show you the list of available channel with indexes that can be used
+for adding channels.
+
+ > chat add discord !1 #mydiscordchannel
+ > chan #mydiscordchannel set auto_join true
+ > /join #mydiscordchannel
+
+If you set auto_join to true, next time you reconnect there will be no need to
+join the channel manually.
+
+Options
+-------
+This section describes options available through "account set" bitlbee command
+(for help on usage of this command see "help account set").
+
+#### host (type: string; default: "discordapp.com")
+
+Discord server hostname. Just in case discord changes the hostname or there
+are some alternatives with compatible API.
+
+#### voice_status_notify (type: boolean; default: no)
+
+This enables text notifications in your control channel about users
+changing/leaving voice channels. Can be noisy on big servers.
+
+#### edit_prefix (type: string; default: "EDIT: ")
+
+A string that will be prefixed to an edited message to distinguish those
+from normal ones.
+
+#### urlinfo_handle (type: string; default: "urlinfo")
+
+User handle that will be used to post url expansion info such as title and
+description in groupchats.
+
+#### max_backlog (type: integer; default: 50)
+
+Maximum number of backlog messages per channel to fetch on connection.
+Unlike twitter implementation in bitlbee this won't dump seen messages.
+Setting this to 0 or negative values disables backlog fetching.
+
+#### send_acks (type: boolean; default: yes)
+
+By default bitlbee-discord will send an "ack" for every message received,
+thus marking everything as "read" on mobile/webapp. Setting this to false
+will disable all acks from bitlbee-discord.
+
+#### mention_suffix (type: string; default: ":")
+
+Suffix used in a regex to look for username mentions to automatically
+convert your usual irc-style "nick:" mentions to discord's "<@id>" format.
+So if you type "nick: hello" in bitlbee, it will be displayed as
+"@nick hello" in discord. This can be multicharacter and you can even do OR
+logic here because it is actually used as a part of glib regex. That is
+setting this to "[:,]" will match both "nick:" and "nick,". But beware
+overcomplicating this may lead to bitlbee-discord spending a lot of time
+parsing your outgoing messages. Setting this to "" will disable this
+function.
+
+#### mention_ignorecase (type: boolean; default: off)
+
+Ignore case when looking for outgoing mentions. This also affects channel
+mentions.
+
+#### incoming_me_translation (type: boolean; default: on)
+
+This option controls whether bitlbee-discord will translate incoming
+messages that are fully italicized (that is enclosed in '*' characters) to
+'/me' messages.
+
+#### never_offline (type: boolean; default: off)
+
+Contacts from this account will never appear as offline and will be marked
+away instead.
+
+#### server_prefix_len (type: int; default: 3)
+
+Prefix channel names with this many characters of server name. If set to 0
+nothing will be prefixed. If set to anything lower than 0 - full server
+name will be prefixed. Assuming we have a channel "general" on "beecord"
+server here is what channel name you are going to get with different
+settings:
+
+ -1 - #beecord.general
+ 0 - #general
+ 3 - #bee.general
+
+#### fetch_pinned (type: boolean; default: off)
+
+Fetch pinned messages on channel join.
+
+#### friendship_mode (type: boolean; default: on)
+
+With this option enabled, online/offline status is determined by the
+friendship relationship with a user in addition to their actual away
+status, and other users are added to channels.
+
+#### always_afk (type: boolean; default: off)
+
+When enabled bitlbee-discord would always report client's status as afk.
+This feature is not properly documented in official docs, but it presumably
+can force push notifications to other clients when bitlbee is connected.
+
+#### emoji_urls (type: boolean; default: on)
+
+Controls whether bitlbee-discord would display an url to emoji image next
+to it's text alias.
+
+#### auto_join (type: boolean; default: off)
+
+Automatically join all of the server's channels so you don't have to add
+them manually (no "chat add" needed).
+
+#### auto_join_exclude (type: string; default: "")
+
+Comma-separated list of channel patterns to exclude when auto-joining
+channels. * matches any text, ? matches a single character. For instance,
+"Foo.*,Bar.A" will exclude all channels from server "Foo" and channel "A"
+from server "Bar".
+
+#### verbose (type: boolean; default: off)
+
+Show more protocol-related messages in control channel.
+
+Debugging
+---------
+You can enable extra debug output for bitlbee-discord, by setting BITLBEE_DEBUG
+environment variable. This will enable bitlbee-discord to print all traffic it
+exchanges with discord servers to stdout and there is a lot of it. To get it
+on your screen run bitlbee by hand in foreground mode:
+
+ $ BITLBEE_DEBUG=1 bitlbee -nvD
+
+then connect with an irc client as you usually do.
+
+*WARNING*: there IS sensitive information in this debug output, such as auth
+tokens, your plaintext password and, obviously, your incoming and outgoing
+messages. Be sure to remove any information you are not willing to share before
+posting it anywhere.
+
+If you are experiencing crashes please refer to this page for information on
+how to get a meaningful backtrace: https://wiki.bitlbee.org/DebuggingCrashes
+
+Bugs
+----
+Please report bugs at github: https://github.com/sm00th/bitlbee-discord/issues
+For questions, bitlbee-discord breakage demonstrations and chitchat you can
+join the following discord server: https://discord.gg/0lUXEAZXmvW3ovUC or ping
+`trac3r` on irc.oftc.net/#bitlbee (irc is preferable).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/src/discord-handlers.c
new/bitlbee-discord-0.4.3+7.g607f988/src/discord-handlers.c
--- old/bitlbee-discord-0.4.3+0.g9466079/src/discord-handlers.c 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/src/discord-handlers.c 2021-09-28
18:38:48.000000000 +0200
@@ -601,6 +601,7 @@
gboolean posted = FALSE;
gchar *msg = json_o_strdup(minfo, "content");
json_value *jpinned = json_o_get(minfo, "pinned");
+ json_value *ref = json_o_get(minfo, "referenced_message");
gboolean pinned = (jpinned != NULL && jpinned->type == json_boolean) ?
jpinned->u.boolean : FALSE;
@@ -618,6 +619,16 @@
return FALSE;
}
+ if (ref != NULL && ref->type == json_object) {
+ gchar *rauthor = discord_canonize_name(json_o_str(json_o_get(ref,
+ "author"), "username"));
+ gchar *rmsg = g_strdup_printf("IN_REPLY_TO: %s> %.50s...", rauthor,
+ json_o_str(ref, "content"));
+ posted = discord_post_message(cinfo, author, rmsg, is_self, tstamp);
+ g_free(rmsg);
+ g_free(rauthor);
+ }
+
if (pinned == TRUE) {
gchar *newmsg = g_strconcat("PINNED: ", msg, NULL);
g_free(msg);
@@ -868,7 +879,9 @@
dd->heartbeat_timeout_id = 0;
}
} else if (op == OPCODE_RECONNECT) {
- imcb_log(ic, "Reconnect requested");
+ if (set_getbool(&ic->acc->set, "verbose")) {
+ imcb_log(ic, "Reconnect requested");
+ }
discord_soft_reconnect(ic);
} else if (op == OPCODE_INVALID_SESSION) {
imcb_error(ic, "Invalid session, reconnecting");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bitlbee-discord-0.4.3+0.g9466079/src/discord-http.c
new/bitlbee-discord-0.4.3+7.g607f988/src/discord-http.c
--- old/bitlbee-discord-0.4.3+0.g9466079/src/discord-http.c 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/src/discord-http.c 2021-09-28
18:38:48.000000000 +0200
@@ -175,6 +175,9 @@
if (dd->gateway->path == NULL) {
dd->gateway->path = g_strdup("/?encoding=json&v=6");
+ } else if (g_strcmp0(dd->gateway->path, "") == 0) {
+ g_free(dd->gateway->path);
+ dd->gateway->path = g_strdup("/?encoding=json&v=6");
}
g_match_info_free(match);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/bitlbee-discord-0.4.3+0.g9466079/src/discord-websockets.c
new/bitlbee-discord-0.4.3+7.g607f988/src/discord-websockets.c
--- old/bitlbee-discord-0.4.3+0.g9466079/src/discord-websockets.c
2020-03-31 22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/src/discord-websockets.c
2021-09-28 18:38:48.000000000 +0200
@@ -121,7 +121,9 @@
b_input_condition cond)
{
struct im_connection *ic = data;
- imcb_log(ic, "Heartbeat timed out, reconnecting...");
+ if (set_getbool(&ic->acc->set, "verbose")) {
+ imcb_log(ic, "Heartbeat timed out, reconnecting...");
+ }
discord_soft_reconnect(ic);
return FALSE;
}
@@ -358,6 +360,8 @@
g_free(bkey);
+ discord_debug(">>> (%s) %s %"G_GSIZE_FORMAT"\n%s\n", dd->uname, __func__,
req->len, req->str);
+
dd->sslfd = ssl_getfd(source);
dd->inpa = b_input_add(dd->sslfd, B_EV_IO_READ, discord_ws_in_cb, ic);
ssl_write(dd->ssl, req->str, req->len);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/bitlbee-discord-0.4.3+0.g9466079/src/discord.c
new/bitlbee-discord-0.4.3+7.g607f988/src/discord.c
--- old/bitlbee-discord-0.4.3+0.g9466079/src/discord.c 2020-03-31
22:20:38.000000000 +0200
+++ new/bitlbee-discord-0.4.3+7.g607f988/src/discord.c 2021-09-28
18:38:48.000000000 +0200
@@ -113,6 +113,8 @@
s = set_add(&acc->set, "friendship_mode", "on", set_eval_bool, acc);
s->flags |= ACC_SET_OFFLINE_ONLY;
+ s = set_add(&acc->set, "verbose", "off", set_eval_bool, acc);
+
acc->flags |= ACC_FLAG_AWAY_MESSAGE;
acc->flags |= ACC_FLAG_STATUS_MESSAGE;
@@ -155,7 +157,9 @@
{
discord_data *dd = ic->proto_data;
- imcb_log(ic, "Performing soft-reconnect");
+ if (set_getbool(&ic->acc->set, "verbose")) {
+ imcb_log(ic, "Performing soft-reconnect");
+ }
discord_ws_cleanup(dd);
dd->reconnecting = TRUE;
discord_do_login(ic);
++++++ bitlbee-discord.obsinfo ++++++
--- /var/tmp/diff_new_pack.SKngRX/_old 2021-10-04 18:42:39.778320484 +0200
+++ /var/tmp/diff_new_pack.SKngRX/_new 2021-10-04 18:42:39.782320491 +0200
@@ -1,5 +1,5 @@
name: bitlbee-discord
-version: 0.4.3+0.g9466079
-mtime: 1585686038
-commit: 9466079361c49639cef7cc2eb54dba94544be307
+version: 0.4.3+7.g607f988
+mtime: 1632847128
+commit: 607f9887ca85f246e970778e3d40aa5c346365a7
