Automatic commit of package [patrix] release [0.1.16-1].

Created by command:

/usr/bin/tito tag

.tito/packages/patrix

@@ -1 +1 @@
-0.1.11-1 ./
+0.1.16-1 ./

patrix.spec

@@ -1,5 +1,5 @@
 Name: patrix
-Version: 0.1.11
+Version: 0.1.16
 Release: 1%{?dist}
 Summary: Command line client for Matrix
 
@@ -23,7 +23,7 @@ Requires: perl(URI::Escape)
 Requires: perl(Term::ReadKey)
 Requires: perl(Hash::Merge::Simple)
 Requires: perl(Scalar::Util)
-Requires: perl(LWP::Protocol::connect)
+Requires: perl(HTML::Strip)
 
 %description
 Patrix is a simple (and quite limited) client for the Matrix communication network
@@ -53,6 +53,22 @@ room via the command line.
 %{_bindir}/patrix
 
 %changelog
+* Mon Feb 13 2023 Daniel Berteaud <dbd@ehtrace.com> 0.1.16-1
+- Add HTML::Strip to Required (dbd@ehtrace.com)
+- Add HTML::Strip and always support HTML messages (imagotrigger@gmail.com)
+
+* Tue Jul 26 2022 Daniel Berteaud <dbd@ehtrace.com> 0.1.15-1
+- Resign with new key
+
+* Tue Jan 11 2022 Daniel Berteaud <dbd@ehtrace.com> 0.1.14-1
+- Release bump for rebuild
+
+* Mon Jan 03 2022 Daniel Berteaud <dbd@ehtrace.com> 0.1.13-1
+- Check config readability and global /etc/patrixrc (dbd@ehtrace.com)
+
+* Thu Dec 09 2021 Daniel Berteaud <dani@lapiole.org> 0.1.12-1
+- Revert requiring LWP::Protocol::connect (dani@lapiole.org)
+
 * Wed Dec 08 2021 Daniel Berteaud <dani@lapiole.org> 0.1.11-1
 - Rebuild with new key
 

scripts/patrix

@@ -15,8 +15,10 @@ use URI::Escape;
 use Term::ReadKey;
 use Hash::Merge::Simple qw(merge);
 use Scalar::Util qw(looks_like_number);
+use HTML::Strip;
 
 our $opt;
+our $hs = HTML::Strip->new();
 
 GetOptions(
   "user=s"                             => \$opt->{user},
@@ -52,13 +54,29 @@ GetOptions(
   "perm_reset|reset-permission"        => \$opt->{perm_reset}
 );
 
-if (-e File::HomeDir->my_home . "/.patrixrc" && !$opt->{conf}){
-  $opt->{conf} = File::HomeDir->my_home . "/.patrixrc";
-  debug("Using default config file $opt->{conf}");
+if (!$opt->{conf}){
+  # Read global config if it exists and is readable
+  if (-f '/etc/patrixrc' && open(CONFIG, '<', '/etc/patrixrc')){
+    $opt->{conf} = '/etc/patrixrc';
+    close CONFIG;
+    debug("Using global config file $opt->{conf}");
+  }
+
+  # If there's a user defined config, use it instead
+  if (-f File::HomeDir->my_home . "/.patrixrc" && open(CONFIG, '<', File::HomeDir->my_home . "/.patrixrc")){
+    $opt->{conf} = File::HomeDir->my_home . "/.patrixrc";
+    close CONFIG;
+    debug("Using default config file $opt->{conf}");
+  }
 }
+
 if ($opt->{conf} && -e $opt->{conf}){
   read_conf();
 }
+else {
+  die "No configuration found.\nYou should either create one in ~/.patrixrc " .
+      "or give the path of a custom config with --config /path/to/patrixrc";
+}
 
 # alias for --action=foo is --foo
 my @actions = qw(
@@ -240,8 +258,12 @@ sub send_msg {
   }
   my $json = {
     msgtype => ($opt->{action} eq 'send-notice') ? 'm.notice' : 'm.text',
-    body => $opt->{message}
+    body => $hs->parse($opt->{message}),
+    formatted_body => $opt->{message},
+    format => "org.matrix.custom.html",
   };
+  $hs->eof();
+  
   # If we send code, we have to format it correctly
   if ($opt->{action} eq 'send-code'){
     $json->{formatted_body} = '<pre><code>' . $opt->{message} . '</code></pre>';