File matrix-appservice-irc-node-irc-iconv-optional.p... of Package matrix-appservice-irc

Overview Repositories Revisions Requests Users Attributes Meta

File matrix-appservice-irc-node-irc-iconv-optional.patch of Package matrix-appservice-irc

From 3e8e8ec55729722ee1bf12f6c252dccfe225e943 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Tue, 22 Dec 2020 21:36:02 +0000
Subject: [PATCH] Make iconv dependency optional again.

Although iconv is listed in optionalDependencies, it's alays required
in Client.prototype.convertEncoding function in lib/irc.js file,
even if neither "encoding" nor "encodingFallback" orions are defined.

This error was introduced in 19daa5b2 when require('iconv') was
erroneously moved to the top of that function to avoid code duplication.

This change makes iconv module not required again when encoding and
encodingFallback options are not defined.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
---
 lib/irc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/irc.js b/lib/irc.js
index 314f374..b7795aa 100644
--- a/lib/irc.js
+++ b/lib/irc.js
@@ -1277,7 +1277,6 @@ Client.prototype.ctcp = function(to, type, text) {
 
 Client.prototype.convertEncoding = function(str) {
     var self = this, out = str;
-    const Iconv = require('iconv').Iconv;
 
     if (self.opt.encoding) {
         try {
@@ -1286,6 +1285,7 @@ Client.prototype.convertEncoding = function(str) {
             if (!charset) {
                 throw Error("No charset detected");
             }
+            const Iconv = require('iconv').Iconv;
             const converter = new Iconv(charset.encoding, self.opt.encoding);
             out = converter.convert(str);
         } catch (err) {
@@ -1297,6 +1297,7 @@ Client.prototype.convertEncoding = function(str) {
     } else if (self.opt.encodingFallback) {
         try {
             if (!isValidUTF8(str)) {
+                const Iconv = require('iconv').Iconv;
                 const converter = new Iconv(self.opt.encodingFallback, "UTF-8")
                 out = converter.convert(str)
             }
-- 
2.26.2

Places

File matrix-appservice-irc-node-irc-iconv-optional.patch of Package matrix-appservice-irc

Places