diff options
| author | Marius Halden <marius.h@lden.org> | 2017-04-25 11:57:19 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-04-25 11:57:19 +0200 |
| commit | 64f4d843217aed18605284f8c4ebba93724e5a63 (patch) | |
| tree | b4726342c910029796af57f9fd9da155c131e178 | |
| parent | dd46ae5bef1c34773a3e7d3e2ef48fc013cef283 (diff) | |
| parent | 55bc71e550bc798a8edf968474e4642c3f79ba63 (diff) | |
Merge branch 'master' into patched-master
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | init/bitlbee@.service.in | 1 | ||||
| -rw-r--r-- | protocols/twitter/twitter.c | 3 | ||||
| -rw-r--r-- | protocols/twitter/twitter_lib.c | 7 |
4 files changed, 13 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index 4699d1c3..e31e0710 100755 --- a/debian/rules +++ b/debian/rules @@ -119,7 +119,8 @@ binary-common: for p in bitlbee bitlbee-libpurple bitlbee-dev bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done dh_installdebconf ifeq ($(HAS_DH_SYSTEMD),1) - dh_systemd_enable + dh_systemd_enable --no-enable bitlbee.socket + dh_systemd_enable bitlbee.service dh_installinit --init-script=bitlbee dh_systemd_start else diff --git a/init/bitlbee@.service.in b/init/bitlbee@.service.in index 107c11ba..da33d233 100644 --- a/init/bitlbee@.service.in +++ b/init/bitlbee@.service.in @@ -4,4 +4,5 @@ Description=BitlBee Per-Connection Server [Service] ExecStart=@sbindir@bitlbee -I StandardInput=socket +StandardError=syslog User=bitlbee diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c index 623d5e6c..b0ab98c4 100644 --- a/protocols/twitter/twitter.c +++ b/protocols/twitter/twitter.c @@ -618,6 +618,9 @@ static void twitter_init(account_t * acc) s = set_add(&acc->set, "_last_tweet", "0", NULL, acc); s->flags |= SET_HIDDEN | SET_NOSAVE; + s = set_add(&acc->set, "in_korea", "false", set_eval_bool, acc); + s->flags |= SET_HIDDEN; + if (strcmp(acc->prpl->name, "twitter") == 0) { s = set_add(&acc->set, "stream", "true", set_eval_bool, acc); s->flags |= ACC_SET_OFFLINE_ONLY; diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c index 6b2461fe..a046f35e 100644 --- a/protocols/twitter/twitter_lib.c +++ b/protocols/twitter/twitter_lib.c @@ -1753,6 +1753,13 @@ void twitter_post_status(struct im_connection *ic, char *msg, guint64 in_reply_t "true", }; + if (set_getbool(&ic->acc->set, "in_korea") && !in_reply_to) { + g_free(args[3]); + args[2] = "place_id"; + args[3] = g_strdup("c999e6a453e9ef72"); + in_reply_to = 1; + } + twitter_http(ic, TWITTER_STATUS_UPDATE_URL, twitter_http_post, ic, 1, args, in_reply_to ? (set_getbool(&ic->acc->set, "autofill_reply") ? 6 : 4) : 2); g_free(args[3]); |