Merge pull request #244 from euank/urban2

modules/ud: switch to more maintained ud impl

Author: euank

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: '8'
+        node-version: '14'
         cache: 'npm'
     - name: Install deps
       run: sudo apt-get install -y libicu-dev

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:14
 COPY . /usr/src/app/
 WORKDIR /usr/src/app
 

bot.js

@@ -8,8 +8,6 @@ const changeCase = require('change-case');
 const SnailEscape = require('snailescape.js');
 const bunyan = require('bunyan');
 
-let heapdump = null;
-
 const log = bunyan.createLogger({
   name: 'euircbot',
   serializers: { err: bunyan.stdSerializers.err },
@@ -24,15 +22,6 @@ const bot = {};
 bot.util = {}; // Util functions
 
 bot.init = function botInit(cb) {
-  if (bot.config.heapdump) {
-    log.debug('enabling heap dumps');
-    heapdump = require('heapdump');
-    process.on('SIGINT', () => {
-      log.warn('dumping heap, if configured, and exiting');
-      bot.dump();
-      process.exit();
-    });
-  }
   bot.configfolder = bot.config.configfolder;
   bot.tmpfolder = bot.config.tmpfolder;
   bot.datafolder = bot.config.datafolder;
@@ -503,17 +492,6 @@ bot.fsListData = function botFsListData(namespace, listPath, cb) {
   fs.readdir(finalPath, cb);
 };
 
-bot.dump = function botDump() {
-  if (heapdump) {
-    heapdump.writeSnapshot((err, filename) => {
-      log.warn('heapdump written to', filename);
-    });
-  } else {
-    log.trace('dump called, but heapdump off');
-  }
-};
-
-
 bot.run = function botRun() {
   async.series([
     function loadConf(cb) {

config.example.json

@@ -11,7 +11,6 @@
   "port": 6667,
   "timeout": 256,
   "debug": false,
-  "heapdump": false,
   "mainChannel": "#seubot",
   "channels": "#seubot",
   "autoRejoin": true,

modules/urbandictionary/index.js

@@ -1,4 +1,4 @@
-const urban = require('urban');
+const ud = require('urban-dictionary');
 
 const elems = {
   ud: ['definition'],
@@ -18,21 +18,16 @@ function usage(command, reply) {
 }
 
 function getFirst(command, term, reply) {
-  let result;
-  try {
-    result = urban(term);
-  } catch (ex) {
-    reply(`Error getting entry for ${term}`);
-  }
-
-  result.first((json) => {
-    if (json) {
-      elems[command].forEach((elem) => {
-        reply.custom({ lines: 5, replaceNewlines: true, pmExtra: true }, `${elem}: ${json[elem]}`);
-      });
-    } else {
-      reply(`No entry for ${term}`);
+  ud.define(term).then((results) => {
+    if (results.length === 0) {
+      reply(`No results for ${term}`);
+      return;
     }
+    elems[command].forEach((elem) => {
+      reply.custom({ lines: 5, replaceNewlines: true, pmExtra: true }, `${elem}: ${results[0][elem]}`);
+    });
+  }).catch((error) => {
+    reply(`Error getting ${term}: ${error.message}`);
   });
 }
 

modules/urbandictionary/package.json

@@ -4,7 +4,7 @@
   "description": "UrbanDictionary module",
   "main": "index.js",
   "dependencies": {
-    "urban": "git+https://github.com/euank/urban.git"
+    "urban-dictionary": "^3.0.2"
   },
   "author": "LinuxMercedes",
   "license": "MIT"