rebase from upstream

Author: Death916

assets/fontello/config.json

@@ -205,6 +205,8 @@
       "css": "reply-1",
       "code": 59419,
       "src": "entypo"
+    },
+    {
       "uid": "757afacc32d82967975cbb3b45cfb41b",
       "css": "desktop",
       "code": 61704,

src/buffer.rs

@@ -1265,6 +1265,7 @@ impl Buffer {
             | Buffer::FileTransfers(_)
             | Buffer::Logs(_)
             | Buffer::Highlights(_)
+            | Buffer::ChannelMonitor(_)
             | Buffer::ChannelDiscovery(_) => None,
             Buffer::Server(state) => state.input_view.draft_reply(),
             Buffer::Channel(state) => state.input_view.draft_reply(),
@@ -1278,6 +1279,7 @@ impl Buffer {
             | Buffer::FileTransfers(_)
             | Buffer::Logs(_)
             | Buffer::Highlights(_)
+            | Buffer::ChannelMonitor(_)
             | Buffer::ChannelDiscovery(_) => (),
             Buffer::Server(state) => {
                 state.input_view.set_reply_preview(reply_preview);

src/buffer/channel_monitor.rs

@@ -216,20 +216,16 @@ pub fn view<'a>(
                             } else {
                                 link.url().map(|url| Context::Url {
                                     url,
-                                    server_time: None,
-                                    hash: None,
-                                    msgid: None,
+                                    message: None,
                                     selected_reactions: vec![],
-                                    to_nick: None,
-                                    reply_preview: None,
-                                    redaction: None,
                                 })
                             };
 
                             entry
                                 .view(context, length, config, theme)
                                 .map(scroll_view::Message::ContextMenu)
                         },
+                        None,
                         config,
                     );
                     Some(
@@ -293,6 +289,7 @@ pub fn view<'a>(
                         theme::selectable_text::action,
                         theme::font_style::action,
                         Option::<fn(Color) -> Color>::None,
+                        None,
                         config,
                     );
 

src/screen/dashboard/pane.rs

@@ -162,7 +162,10 @@ impl Pane {
                 .wrapping(Wrapping::None)
                 .ellipsis(text::Ellipsis::End)
                 .into(),
-             Buffer::ChannelMonitor(_) => text("Channel Monitor").into(),
+            Buffer::ChannelMonitor(_) => text("Channel Monitor")
+                .wrapping(Wrapping::None)
+                .ellipsis(text::Ellipsis::End)
+                .into(),
         };
 
         let title_bar = self.title_bar.view(