diff options
| author | fiaxh <git@mx.ax.lt> | 2018-01-30 17:29:54 +0100 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2018-01-30 17:29:54 +0100 |
| commit | ef40b617349f49f3f7543b4647bb142590773bc5 (patch) | |
| tree | b3d608d9179787deb0424d530309788b74c41f20 /plugins | |
| parent | 8c46c423c09d2a2bb50f086414d2fb373b3a64c9 (diff) | |
| download | dino-ef40b617349f49f3f7543b4647bb142590773bc5.tar.gz dino-ef40b617349f49f3f7543b4647bb142590773bc5.zip | |
Small fixes
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/http-files/src/file_provider.vala | 6 | ||||
| -rw-r--r-- | plugins/omemo/src/manager.vala | 2 | ||||
| -rw-r--r-- | plugins/openpgp/src/manager.vala | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/plugins/http-files/src/file_provider.vala b/plugins/http-files/src/file_provider.vala index 5737ebf8..b647cdbb 100644 --- a/plugins/http-files/src/file_provider.vala +++ b/plugins/http-files/src/file_provider.vala @@ -11,14 +11,12 @@ public class FileProvider : Dino.FileProvider, Object { private StreamInteractor stream_interactor; private Regex url_regex; - private Regex file_ext_regex; private Gee.List<string> ignore_once = new ArrayList<string>(); public FileProvider(StreamInteractor stream_interactor, Dino.Database dino_db) { this.stream_interactor = stream_interactor; this.url_regex = new Regex("""^(?i)\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))$"""); - this.file_ext_regex = new Regex("""\.(png|jpg|jpeg|svg|gif|pgp)$"""); stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(new ReceivedMessageListener(this)); stream_interactor.get_module(Manager.IDENTITY).uploaded.connect((file_transfer, url) => { @@ -28,7 +26,7 @@ public class FileProvider : Dino.FileProvider, Object { private class ReceivedMessageListener : MessageListener { - public string[] after_actions_const = new string[]{ "" }; + public string[] after_actions_const = new string[]{ }; public override string action_group { get { return "DECRYPT"; } } public override string[] after_actions { get { return after_actions_const; } } @@ -47,7 +45,7 @@ public class FileProvider : Dino.FileProvider, Object { if (message.direction == Message.DIRECTION_RECEIVED && !in_roster) return false; string? oob_url = Xmpp.Xep.OutOfBandData.get_url_from_message(message.stanza); - if ((oob_url != null && oob_url == message.body) || outer.file_ext_regex.match(message.body)) { + if (oob_url != null && oob_url == message.body) { yield outer.download_url(message, conversation); } return false; diff --git a/plugins/omemo/src/manager.vala b/plugins/omemo/src/manager.vala index f4c5ed0f..00b73138 100644 --- a/plugins/omemo/src/manager.vala +++ b/plugins/omemo/src/manager.vala @@ -72,7 +72,7 @@ public class Manager : StreamInteractionModule, Object { private class ReceivedMessageListener : MessageListener { - public string[] after_actions_const = new string[]{ "" }; + public string[] after_actions_const = new string[]{ }; public override string action_group { get { return "DECRYPT"; } } public override string[] after_actions { get { return after_actions_const; } } diff --git a/plugins/openpgp/src/manager.vala b/plugins/openpgp/src/manager.vala index 4f8b87bb..6ec30acc 100644 --- a/plugins/openpgp/src/manager.vala +++ b/plugins/openpgp/src/manager.vala @@ -102,7 +102,7 @@ public class Manager : StreamInteractionModule, Object { private class ReceivedMessageListener : MessageListener { - public string[] after_actions_const = new string[]{ "" }; + public string[] after_actions_const = new string[]{ }; public override string action_group { get { return "DECRYPT"; } } public override string[] after_actions { get { return after_actions_const; } } |