From 618ecc07142ad580a865148fd5b0a4364872eae1 Mon Sep 17 00:00:00 2001 From: David Stephens Date: Fri, 24 Nov 2017 23:23:15 +0000 Subject: [PATCH] Move modules in mods into /core --- config/menu.hjson | 70 +++++++++---------- {mods/system => core}/abracadabra.js | 10 +-- {mods/system => core}/bbs_link.js | 6 +- {mods/system => core}/bbs_list.js | 14 ++-- {mods/system => core}/erc_client.js | 4 +- .../system => core}/file_area_filter_edit.js | 10 +-- {mods/system => core}/file_area_list.js | 34 ++++----- .../system => core}/file_base_area_select.js | 8 +-- .../file_base_download_manager.js | 16 ++--- {mods/system => core}/file_base_search.js | 8 +-- .../file_base_web_download_manager.js | 20 +++--- .../file_transfer_protocol_select.js | 8 +-- {mods/system => core}/last_callers.js | 10 +-- core/module_util.js | 1 - {mods/system => core}/msg_area_list.js | 12 ++-- {mods/system => core}/msg_area_post_fse.js | 4 +- {mods/system => core}/msg_area_reply_fse.js | 2 +- {mods/system => core}/msg_area_view_fse.js | 4 +- {mods/system => core}/msg_conf_list.js | 12 ++-- {mods/system => core}/msg_list.js | 10 +-- {mods/system => core}/nua.js | 12 ++-- {mods/system => core}/onelinerz.js | 12 ++-- {mods/system => core}/rumorz.js | 14 ++-- {mods/system => core}/telnet_bridge.js | 6 +- {mods/system => core}/upload.js | 28 ++++---- {mods/system => core}/user_list.js | 8 +-- {mods/system => core}/whos_online.js | 8 +-- mods/{user => }/.keep | 0 28 files changed, 175 insertions(+), 176 deletions(-) rename {mods/system => core}/abracadabra.js (94%) rename {mods/system => core}/bbs_link.js (96%) rename {mods/system => core}/bbs_list.js (96%) rename {mods/system => core}/erc_client.js (97%) rename {mods/system => core}/file_area_filter_edit.js (95%) rename {mods/system => core}/file_area_list.js (94%) rename {mods/system => core}/file_base_area_select.js (88%) rename {mods/system => core}/file_base_download_manager.js (92%) rename {mods/system => core}/file_base_search.js (89%) rename {mods/system => core}/file_base_web_download_manager.js (91%) rename {mods/system => core}/file_transfer_protocol_select.js (93%) rename {mods/system => core}/last_callers.js (92%) rename {mods/system => core}/msg_area_list.js (91%) rename {mods/system => core}/msg_area_post_fse.js (90%) rename {mods/system => core}/msg_area_reply_fse.js (81%) rename {mods/system => core}/msg_area_view_fse.js (95%) rename {mods/system => core}/msg_conf_list.js (89%) rename {mods/system => core}/msg_list.js (95%) rename {mods/system => core}/nua.js (91%) rename {mods/system => core}/onelinerz.js (95%) rename {mods/system => core}/rumorz.js (92%) rename {mods/system => core}/telnet_bridge.js (94%) rename {mods/system => core}/upload.js (94%) rename {mods/system => core}/user_list.js (91%) rename {mods/system => core}/whos_online.js (87%) rename mods/{user => }/.keep (100%) diff --git a/config/menu.hjson b/config/menu.hjson index b445ec85..ce5e8a38 100644 --- a/config/menu.hjson +++ b/config/menu.hjson @@ -220,7 +220,7 @@ } newUserApplication: { - module: nua + module: @systemModule:nua art: NUA options: { menuFlags: [ "noHistory" ] @@ -341,7 +341,7 @@ // Canceling this form logs off vs falling back to matrix // newUserApplicationSsh: { - module: nua + module: @systemModule:nua art: NUA fallback: logoff options: { @@ -445,7 +445,7 @@ newUserFeedbackToSysOp: { desc: Feedback to SysOp - module: msg_area_post_fse + module: @systemModule:msg_area_post_fse next: [ { acs: AS2 @@ -579,7 +579,7 @@ fullLoginSequenceLastCallers: { desc: Last Callers - module: last_callers + module: @systemModule:last_callers art: LASTCALL options: { pause: true @@ -589,7 +589,7 @@ } fullLoginSequenceWhosOnline: { desc: Who's Online - module: whos_online + module: @systemModule:whos_online art: WHOSON options: { pause: true } next: fullLoginSequenceOnelinerz @@ -597,7 +597,7 @@ fullLoginSequenceOnelinerz: { desc: Viewing Onelinerz - module: onelinerz + module: @systemModule:onelinerz next: [ { // calls >= 2 @@ -732,7 +732,7 @@ newScanMessageList: { desc: New Messages - module: msg_list + module: @systemModule:msg_list art: NEWMSGS config: { menuViewPost: messageAreaViewPost @@ -772,7 +772,7 @@ } newScanFileBaseList: { - module: file_area_list + module: @systemModule:file_area_list desc: New Files config: { art: { @@ -1019,14 +1019,14 @@ mainMenuLastCallers: { desc: Last Callers - module: last_callers + module: @systemModule:last_callers art: LASTCALL options: { pause: true } } mainMenuWhosOnline: { desc: Who's Online - module: whos_online + module: @systemModule:whos_online art: WHOSON options: { pause: true } } @@ -1045,7 +1045,7 @@ mainMenuUserList: { desc: User Listing - module: user_list + module: @systemModule:user_list art: USERLST form: { 0: { @@ -1166,7 +1166,7 @@ mainMenuFeedbackToSysOp: { desc: Feedback to SysOp - module: msg_area_post_fse + module: @systemModule:msg_area_post_fse config: { art: { header: MSGEHDR @@ -1286,7 +1286,7 @@ mainMenuOnelinerz: { desc: Viewing Onelinerz - module: onelinerz + module: @systemModule:onelinerz options: { cls: true } @@ -1372,7 +1372,7 @@ mainMenuRumorz: { desc: Rumorz - module: rumorz + module: @systemModule:rumorz options: { cls: true } @@ -1458,7 +1458,7 @@ ercClient: { art: erc - module: erc_client + module: @systemModule:erc_client config: { host: localhost port: 5001 @@ -1510,7 +1510,7 @@ bbsList: { desc: Viewing BBS List - module: bbs_list + module: @systemModule:bbs_list options: { cls: true } @@ -1661,7 +1661,7 @@ // doorPimpWars: { desc: Playing PimpWars - module: abracadabra + module: @systemModule:abracadabra config: { name: PimpWars dropFileType: DORINFO @@ -1684,7 +1684,7 @@ // doorTradeWars2002BBSLink: { desc: Playing TW 2002 (BBSLink) - module: bbs_link + module: @systemModule:bbs_link config: { sysCode: XXXXXXXX authCode: XXXXXXXX @@ -1716,7 +1716,7 @@ telnetBridgeAgency: { desc: Connected to HappyLand BBS - module: telnet_bridge + module: @systemModule:telnet_bridge config: { host: agency.bbs.geek.nz } @@ -1779,7 +1779,7 @@ messageAreaChangeCurrentConference: { art: CCHANGE - module: msg_conf_list + module: @systemModule:msg_conf_list form: { 0: { mci: { @@ -1810,7 +1810,7 @@ messageAreaChangeCurrentArea: { // :TODO: rename this art to ACHANGE art: CHANGE - module: msg_area_list + module: @systemModule:msg_area_list form: { 0: { mci: { @@ -1839,7 +1839,7 @@ } messageAreaMessageList: { - module: msg_list + module: @systemModule:msg_list art: MSGLIST config: { menuViewPost: messageAreaViewPost @@ -1875,7 +1875,7 @@ } messageAreaViewPost: { - module: msg_area_view_fse + module: @systemModule:msg_area_view_fse config: { art: { header: MSGVHDR @@ -1991,7 +1991,7 @@ } messageAreaReplyPost: { - module: msg_area_post_fse + module: @systemModule:msg_area_post_fse config: { art: { header: MSGEHDR @@ -2150,7 +2150,7 @@ // :TODO: messageAreaSelect (change msg areas -> call @systemMethod -> fallback to menu messageAreaNewPost: { desc: Posting message, - module: msg_area_post_fse + module: @systemModule:msg_area_post_fse config: { art: { header: MSGEHDR @@ -2306,7 +2306,7 @@ mailMenuCreateMessage: { desc: Mailing Someone - module: msg_area_post_fse + module: @systemModule:msg_area_post_fse config: { art: { header: MSGEHDR @@ -2423,7 +2423,7 @@ } mailMenuInbox: { - module: msg_list + module: @systemModule:msg_list art: MSGLIST config: { menuViewPost: messageAreaViewPost @@ -2501,7 +2501,7 @@ } fileBaseListEntries: { - module: file_area_list + module: @systemModule:file_area_list desc: Browsing Files config: { art: { @@ -2669,7 +2669,7 @@ fileBaseBrowseByAreaSelect: { desc: Browsing File Areas - module: file_base_area_select + module: @systemModule:file_base_area_select art: FAREASEL form: { 0: { @@ -2725,7 +2725,7 @@ } fileBaseSearch: { - module: file_base_search + module: @systemModule:file_base_search desc: Searching Files art: FSEARCH form: { @@ -2799,7 +2799,7 @@ fileAreaFilterEditor: { desc: File Filter Editor - module: file_area_filter_edit + module: @systemModule:file_area_filter_edit art: FFILEDT form: { 0: { @@ -2889,7 +2889,7 @@ fileBaseDownloadManager: { desc: Download Manager - module: file_base_download_manager + module: @systemModule:file_base_download_manager config: { art: { queueManager: FDLMGR @@ -2950,7 +2950,7 @@ fileBaseWebDownloadManager: { desc: Web D/L Manager - module: file_base_web_download_manager + module: @systemModule:file_base_web_download_manager config: { art: { queueManager: FWDLMGR @@ -3017,7 +3017,7 @@ fileTransferProtocolSelection: { desc: Protocol selection - module: file_transfer_protocol_select + module: @systemModule:file_transfer_protocol_select art: FPROSEL form: { 0: { @@ -3049,7 +3049,7 @@ fileBaseUploadFiles: { desc: Uploading - module: upload + module: @systemModule:upload config: { art: { options: ULOPTS diff --git a/mods/system/abracadabra.js b/core/abracadabra.js similarity index 94% rename from mods/system/abracadabra.js rename to core/abracadabra.js index 595f84d4..85d1e205 100644 --- a/mods/system/abracadabra.js +++ b/core/abracadabra.js @@ -1,11 +1,11 @@ /* jslint node: true */ 'use strict'; -const MenuModule = require('../../core/menu_module.js').MenuModule; -const DropFile = require('../../core/dropfile.js').DropFile; -const door = require('../../core/door.js'); -const theme = require('../../core/theme.js'); -const ansi = require('../../core/ansi_term.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const DropFile = require('./dropfile.js').DropFile; +const door = require('./door.js'); +const theme = require('./theme.js'); +const ansi = require('./ansi_term.js'); const async = require('async'); const assert = require('assert'); diff --git a/mods/system/bbs_link.js b/core/bbs_link.js similarity index 96% rename from mods/system/bbs_link.js rename to core/bbs_link.js index 1d5492df..be341115 100644 --- a/mods/system/bbs_link.js +++ b/core/bbs_link.js @@ -1,8 +1,8 @@ /* jslint node: true */ 'use strict'; -const MenuModule = require('../../core/menu_module.js').MenuModule; -const resetScreen = require('../../core/ansi_term.js').resetScreen; +const MenuModule = require('./menu_module.js').MenuModule; +const resetScreen = require('./ansi_term.js').resetScreen; const async = require('async'); const _ = require('lodash'); @@ -10,7 +10,7 @@ const http = require('http'); const net = require('net'); const crypto = require('crypto'); -const packageJson = require('../../package.json'); +const packageJson = require('../package.json'); /* Expected configuration block: diff --git a/mods/system/bbs_list.js b/core/bbs_list.js similarity index 96% rename from mods/system/bbs_list.js rename to core/bbs_list.js index 8ae94c6c..33a7ff59 100644 --- a/mods/system/bbs_list.js +++ b/core/bbs_list.js @@ -2,18 +2,18 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; +const MenuModule = require('./menu_module.js').MenuModule; const { getModDatabasePath, getTransactionDatabase -} = require('../../core/database.js'); +} = require('./database.js'); -const ViewController = require('../../core/view_controller.js').ViewController; -const ansi = require('../../core/ansi_term.js'); -const theme = require('../../core/theme.js'); -const User = require('../../core/user.js'); -const stringFormat = require('../../core/string_format.js'); +const ViewController = require('./view_controller.js').ViewController; +const ansi = require('./ansi_term.js'); +const theme = require('./theme.js'); +const User = require('./user.js'); +const stringFormat = require('./string_format.js'); // deps const async = require('async'); diff --git a/mods/system/erc_client.js b/core/erc_client.js similarity index 97% rename from mods/system/erc_client.js rename to core/erc_client.js index cdc71521..4fb549f6 100644 --- a/mods/system/erc_client.js +++ b/core/erc_client.js @@ -1,8 +1,8 @@ /* jslint node: true */ 'use strict'; -const MenuModule = require('../../core/menu_module.js').MenuModule; -const stringFormat = require('../../core/string_format.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const stringFormat = require('./string_format.js'); // deps const async = require('async'); diff --git a/mods/system/file_area_filter_edit.js b/core/file_area_filter_edit.js similarity index 95% rename from mods/system/file_area_filter_edit.js rename to core/file_area_filter_edit.js index 0ff8b37d..4a53096c 100644 --- a/mods/system/file_area_filter_edit.js +++ b/core/file_area_filter_edit.js @@ -2,11 +2,11 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const getSortedAvailableFileAreas = require('../../core/file_base_area.js').getSortedAvailableFileAreas; -const FileBaseFilters = require('../../core/file_base_filter.js'); -const stringFormat = require('../../core/string_format.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const getSortedAvailableFileAreas = require('./file_base_area.js').getSortedAvailableFileAreas; +const FileBaseFilters = require('./file_base_filter.js'); +const stringFormat = require('./string_format.js'); // deps const async = require('async'); diff --git a/mods/system/file_area_list.js b/core/file_area_list.js similarity index 94% rename from mods/system/file_area_list.js rename to core/file_area_list.js index 5359e48e..3bcfd7c2 100644 --- a/mods/system/file_area_list.js +++ b/core/file_area_list.js @@ -2,23 +2,23 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const ansi = require('../../core/ansi_term.js'); -const theme = require('../../core/theme.js'); -const FileEntry = require('../../core/file_entry.js'); -const stringFormat = require('../../core/string_format.js'); -const FileArea = require('../../core/file_base_area.js'); -const Errors = require('../../core/enig_error.js').Errors; -const ErrNotEnabled = require('../../core/enig_error.js').ErrorReasons.NotEnabled; -const ArchiveUtil = require('../../core/archive_util.js'); -const Config = require('../../core/config.js').config; -const DownloadQueue = require('../../core/download_queue.js'); -const FileAreaWeb = require('../../core/file_area_web.js'); -const FileBaseFilters = require('../../core/file_base_filter.js'); -const resolveMimeType = require('../../core/mime_util.js').resolveMimeType; -const isAnsi = require('../../core/string_util.js').isAnsi; -const controlCodesToAnsi = require('../../core/color_codes.js').controlCodesToAnsi; +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const ansi = require('./ansi_term.js'); +const theme = require('./theme.js'); +const FileEntry = require('./file_entry.js'); +const stringFormat = require('./string_format.js'); +const FileArea = require('./file_base_area.js'); +const Errors = require('./enig_error.js').Errors; +const ErrNotEnabled = require('./enig_error.js').ErrorReasons.NotEnabled; +const ArchiveUtil = require('./archive_util.js'); +const Config = require('./config.js').config; +const DownloadQueue = require('./download_queue.js'); +const FileAreaWeb = require('./file_area_web.js'); +const FileBaseFilters = require('./file_base_filter.js'); +const resolveMimeType = require('./mime_util.js').resolveMimeType; +const isAnsi = require('./string_util.js').isAnsi; +const controlCodesToAnsi = require('./color_codes.js').controlCodesToAnsi; // deps const async = require('async'); diff --git a/mods/system/file_base_area_select.js b/core/file_base_area_select.js similarity index 88% rename from mods/system/file_base_area_select.js rename to core/file_base_area_select.js index 38b7eba7..8abb668e 100644 --- a/mods/system/file_base_area_select.js +++ b/core/file_base_area_select.js @@ -2,10 +2,10 @@ 'use strict'; // enigma-bbs -const MenuModule = require('../../core/menu_module.js').MenuModule; -const stringFormat = require('../../core/string_format.js'); -const getSortedAvailableFileAreas = require('../../core/file_base_area.js').getSortedAvailableFileAreas; -const StatLog = require('../../core/stat_log.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const stringFormat = require('./string_format.js'); +const getSortedAvailableFileAreas = require('./file_base_area.js').getSortedAvailableFileAreas; +const StatLog = require('./stat_log.js'); // deps const async = require('async'); diff --git a/mods/system/file_base_download_manager.js b/core/file_base_download_manager.js similarity index 92% rename from mods/system/file_base_download_manager.js rename to core/file_base_download_manager.js index 15a892f1..7444af56 100644 --- a/mods/system/file_base_download_manager.js +++ b/core/file_base_download_manager.js @@ -2,14 +2,14 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const DownloadQueue = require('../../core/download_queue.js'); -const theme = require('../../core/theme.js'); -const ansi = require('../../core/ansi_term.js'); -const Errors = require('../../core/enig_error.js').Errors; -const stringFormat = require('../../core/string_format.js'); -const FileAreaWeb = require('../../core/file_area_web.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const DownloadQueue = require('./download_queue.js'); +const theme = require('./theme.js'); +const ansi = require('./ansi_term.js'); +const Errors = require('./enig_error.js').Errors; +const stringFormat = require('./string_format.js'); +const FileAreaWeb = require('./file_area_web.js'); // deps const async = require('async'); diff --git a/mods/system/file_base_search.js b/core/file_base_search.js similarity index 89% rename from mods/system/file_base_search.js rename to core/file_base_search.js index d3ebd1db..adb618d0 100644 --- a/mods/system/file_base_search.js +++ b/core/file_base_search.js @@ -2,10 +2,10 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const getSortedAvailableFileAreas = require('../../core/file_base_area.js').getSortedAvailableFileAreas; -const FileBaseFilters = require('../../core/file_base_filter.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const getSortedAvailableFileAreas = require('./file_base_area.js').getSortedAvailableFileAreas; +const FileBaseFilters = require('./file_base_filter.js'); // deps const async = require('async'); diff --git a/mods/system/file_base_web_download_manager.js b/core/file_base_web_download_manager.js similarity index 91% rename from mods/system/file_base_web_download_manager.js rename to core/file_base_web_download_manager.js index 9acad951..dea7c5a8 100644 --- a/mods/system/file_base_web_download_manager.js +++ b/core/file_base_web_download_manager.js @@ -2,16 +2,16 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const DownloadQueue = require('../../core/download_queue.js'); -const theme = require('../../core/theme.js'); -const ansi = require('../../core/ansi_term.js'); -const Errors = require('../../core/enig_error.js').Errors; -const stringFormat = require('../../core/string_format.js'); -const FileAreaWeb = require('../../core/file_area_web.js'); -const ErrNotEnabled = require('../../core/enig_error.js').ErrorReasons.NotEnabled; -const Config = require('../../core/config.js').config; +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const DownloadQueue = require('./download_queue.js'); +const theme = require('./theme.js'); +const ansi = require('./ansi_term.js'); +const Errors = require('./enig_error.js').Errors; +const stringFormat = require('./string_format.js'); +const FileAreaWeb = require('./file_area_web.js'); +const ErrNotEnabled = require('./enig_error.js').ErrorReasons.NotEnabled; +const Config = require('./config.js').config; // deps const async = require('async'); diff --git a/mods/system/file_transfer_protocol_select.js b/core/file_transfer_protocol_select.js similarity index 93% rename from mods/system/file_transfer_protocol_select.js rename to core/file_transfer_protocol_select.js index c731dff2..f1b3dbed 100644 --- a/mods/system/file_transfer_protocol_select.js +++ b/core/file_transfer_protocol_select.js @@ -2,10 +2,10 @@ 'use strict'; // enigma-bbs -const MenuModule = require('../../core/menu_module.js').MenuModule; -const Config = require('../../core/config.js').config; -const stringFormat = require('../../core/string_format.js'); -const ViewController = require('../../core/view_controller.js').ViewController; +const MenuModule = require('./menu_module.js').MenuModule; +const Config = require('./config.js').config; +const stringFormat = require('./string_format.js'); +const ViewController = require('./view_controller.js').ViewController; // deps const async = require('async'); diff --git a/mods/system/last_callers.js b/core/last_callers.js similarity index 92% rename from mods/system/last_callers.js rename to core/last_callers.js index 85d4bef0..3a889468 100644 --- a/mods/system/last_callers.js +++ b/core/last_callers.js @@ -2,11 +2,11 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const StatLog = require('../../core/stat_log.js'); -const User = require('../../core/user.js'); -const stringFormat = require('../../core/string_format.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const StatLog = require('./stat_log.js'); +const User = require('./user.js'); +const stringFormat = require('./string_format.js'); // deps const moment = require('moment'); diff --git a/core/module_util.js b/core/module_util.js index b730d0ca..67e87306 100644 --- a/core/module_util.js +++ b/core/module_util.js @@ -102,7 +102,6 @@ function loadModulesForCategory(category, iterator, complete) { function getModulePaths() { return [ Config.paths.mods, - Config.paths.userMods, Config.paths.loginServers, Config.paths.contentServers, Config.paths.scannerTossers, diff --git a/mods/system/msg_area_list.js b/core/msg_area_list.js similarity index 91% rename from mods/system/msg_area_list.js rename to core/msg_area_list.js index 51b18953..eaedbef8 100644 --- a/mods/system/msg_area_list.js +++ b/core/msg_area_list.js @@ -2,12 +2,12 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const messageArea = require('../../core/message_area.js'); -const displayThemeArt = require('../../core/theme.js').displayThemeArt; -const resetScreen = require('../../core/ansi_term.js').resetScreen; -const stringFormat = require('../../core/string_format.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const messageArea = require('./message_area.js'); +const displayThemeArt = require('./theme.js').displayThemeArt; +const resetScreen = require('./ansi_term.js').resetScreen; +const stringFormat = require('./string_format.js'); // deps const async = require('async'); diff --git a/mods/system/msg_area_post_fse.js b/core/msg_area_post_fse.js similarity index 90% rename from mods/system/msg_area_post_fse.js rename to core/msg_area_post_fse.js index a0671f85..c13f39a6 100644 --- a/mods/system/msg_area_post_fse.js +++ b/core/msg_area_post_fse.js @@ -1,8 +1,8 @@ /* jslint node: true */ 'use strict'; -const FullScreenEditorModule = require('../../core/fse.js').FullScreenEditorModule; -const persistMessage = require('../../core/message_area.js').persistMessage; +const FullScreenEditorModule = require('./fse.js').FullScreenEditorModule; +const persistMessage = require('./message_area.js').persistMessage; const _ = require('lodash'); const async = require('async'); diff --git a/mods/system/msg_area_reply_fse.js b/core/msg_area_reply_fse.js similarity index 81% rename from mods/system/msg_area_reply_fse.js rename to core/msg_area_reply_fse.js index 497c8de7..24ee5377 100644 --- a/mods/system/msg_area_reply_fse.js +++ b/core/msg_area_reply_fse.js @@ -1,7 +1,7 @@ /* jslint node: true */ 'use strict'; -var FullScreenEditorModule = require('../../core/fse.js').FullScreenEditorModule; +var FullScreenEditorModule = require('./fse.js').FullScreenEditorModule; exports.getModule = AreaReplyFSEModule; diff --git a/mods/system/msg_area_view_fse.js b/core/msg_area_view_fse.js similarity index 95% rename from mods/system/msg_area_view_fse.js rename to core/msg_area_view_fse.js index 7cb5a1b8..02915f79 100644 --- a/mods/system/msg_area_view_fse.js +++ b/core/msg_area_view_fse.js @@ -2,8 +2,8 @@ 'use strict'; // ENiGMA½ -const FullScreenEditorModule = require('../../core/fse.js').FullScreenEditorModule; -const Message = require('../../core/message.js'); +const FullScreenEditorModule = require('./fse.js').FullScreenEditorModule; +const Message = require('./message.js'); // deps const _ = require('lodash'); diff --git a/mods/system/msg_conf_list.js b/core/msg_conf_list.js similarity index 89% rename from mods/system/msg_conf_list.js rename to core/msg_conf_list.js index 06e9d59b..6f42cf36 100644 --- a/mods/system/msg_conf_list.js +++ b/core/msg_conf_list.js @@ -2,12 +2,12 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const messageArea = require('../../core/message_area.js'); -const displayThemeArt = require('../../core/theme.js').displayThemeArt; -const resetScreen = require('../../core/ansi_term.js').resetScreen; -const stringFormat = require('../../core/string_format.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const messageArea = require('./message_area.js'); +const displayThemeArt = require('./theme.js').displayThemeArt; +const resetScreen = require('./ansi_term.js').resetScreen; +const stringFormat = require('./string_format.js'); // deps const async = require('async'); diff --git a/mods/system/msg_list.js b/core/msg_list.js similarity index 95% rename from mods/system/msg_list.js rename to core/msg_list.js index 28d1b609..e5a69e80 100644 --- a/mods/system/msg_list.js +++ b/core/msg_list.js @@ -2,11 +2,11 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const messageArea = require('../../core/message_area.js'); -const stringFormat = require('../../core/string_format.js'); -const MessageAreaConfTempSwitcher = require('../../core/mod_mixins.js').MessageAreaConfTempSwitcher; +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const messageArea = require('./message_area.js'); +const stringFormat = require('./string_format.js'); +const MessageAreaConfTempSwitcher = require('./mod_mixins.js').MessageAreaConfTempSwitcher; // deps const async = require('async'); diff --git a/mods/system/nua.js b/core/nua.js similarity index 91% rename from mods/system/nua.js rename to core/nua.js index 7b4611d6..7939e739 100644 --- a/mods/system/nua.js +++ b/core/nua.js @@ -2,12 +2,12 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const User = require('../../core/user.js'); -const theme = require('../../core/theme.js'); -const login = require('../../core/system_menu_method.js').login; -const Config = require('../../core/config.js').config; -const messageArea = require('../../core/message_area.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const User = require('./user.js'); +const theme = require('./theme.js'); +const login = require('./system_menu_method.js').login; +const Config = require('./config.js').config; +const messageArea = require('./message_area.js'); exports.moduleInfo = { name : 'NUA', diff --git a/mods/system/onelinerz.js b/core/onelinerz.js similarity index 95% rename from mods/system/onelinerz.js rename to core/onelinerz.js index 416124c6..9e89addf 100644 --- a/mods/system/onelinerz.js +++ b/core/onelinerz.js @@ -2,17 +2,17 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; +const MenuModule = require('./menu_module.js').MenuModule; const { getModDatabasePath, getTransactionDatabase -} = require('../../core/database.js'); +} = require('./database.js'); -const ViewController = require('../../core/view_controller.js').ViewController; -const theme = require('../../core/theme.js'); -const ansi = require('../../core/ansi_term.js'); -const stringFormat = require('../../core/string_format.js'); +const ViewController = require('./view_controller.js').ViewController; +const theme = require('./theme.js'); +const ansi = require('./ansi_term.js'); +const stringFormat = require('./string_format.js'); // deps const sqlite3 = require('sqlite3'); diff --git a/mods/system/rumorz.js b/core/rumorz.js similarity index 92% rename from mods/system/rumorz.js rename to core/rumorz.js index e85271dc..b83853f0 100644 --- a/mods/system/rumorz.js +++ b/core/rumorz.js @@ -2,13 +2,13 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const theme = require('../../core/theme.js'); -const resetScreen = require('../../core/ansi_term.js').resetScreen; -const StatLog = require('../../core/stat_log.js'); -const renderStringLength = require('../../core/string_util.js').renderStringLength; -const stringFormat = require('../../core/string_format.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const theme = require('./theme.js'); +const resetScreen = require('./ansi_term.js').resetScreen; +const StatLog = require('./stat_log.js'); +const renderStringLength = require('./string_util.js').renderStringLength; +const stringFormat = require('./string_format.js'); // deps const async = require('async'); diff --git a/mods/system/telnet_bridge.js b/core/telnet_bridge.js similarity index 94% rename from mods/system/telnet_bridge.js rename to core/telnet_bridge.js index 42c73217..3232228a 100644 --- a/mods/system/telnet_bridge.js +++ b/core/telnet_bridge.js @@ -2,9 +2,9 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const resetScreen = require('../../core/ansi_term.js').resetScreen; -const setSyncTermFontWithAlias = require('../../core/ansi_term.js').setSyncTermFontWithAlias; +const MenuModule = require('./menu_module.js').MenuModule; +const resetScreen = require('./ansi_term.js').resetScreen; +const setSyncTermFontWithAlias = require('./ansi_term.js').setSyncTermFontWithAlias; // deps const async = require('async'); diff --git a/mods/system/upload.js b/core/upload.js similarity index 94% rename from mods/system/upload.js rename to core/upload.js index 8e545452..5a49a0ca 100644 --- a/mods/system/upload.js +++ b/core/upload.js @@ -2,20 +2,20 @@ 'use strict'; // enigma-bbs -const MenuModule = require('../../core/menu_module.js').MenuModule; -const stringFormat = require('../../core/string_format.js'); -const getSortedAvailableFileAreas = require('../../core/file_base_area.js').getSortedAvailableFileAreas; -const getAreaDefaultStorageDirectory = require('../../core/file_base_area.js').getAreaDefaultStorageDirectory; -const scanFile = require('../../core/file_base_area.js').scanFile; -const getFileAreaByTag = require('../../core/file_base_area.js').getFileAreaByTag; -const getDescFromFileName = require('../../core/file_base_area.js').getDescFromFileName; -const ansiGoto = require('../../core/ansi_term.js').goto; -const moveFileWithCollisionHandling = require('../../core/file_util.js').moveFileWithCollisionHandling; -const pathWithTerminatingSeparator = require('../../core/file_util.js').pathWithTerminatingSeparator; -const Log = require('../../core/logger.js').log; -const Errors = require('../../core/enig_error.js').Errors; -const FileEntry = require('../../core/file_entry.js'); -const isAnsi = require('../../core/string_util.js').isAnsi; +const MenuModule = require('./menu_module.js').MenuModule; +const stringFormat = require('./string_format.js'); +const getSortedAvailableFileAreas = require('./file_base_area.js').getSortedAvailableFileAreas; +const getAreaDefaultStorageDirectory = require('./file_base_area.js').getAreaDefaultStorageDirectory; +const scanFile = require('./file_base_area.js').scanFile; +const getFileAreaByTag = require('./file_base_area.js').getFileAreaByTag; +const getDescFromFileName = require('./file_base_area.js').getDescFromFileName; +const ansiGoto = require('./ansi_term.js').goto; +const moveFileWithCollisionHandling = require('./file_util.js').moveFileWithCollisionHandling; +const pathWithTerminatingSeparator = require('./file_util.js').pathWithTerminatingSeparator; +const Log = require('./logger.js').log; +const Errors = require('./enig_error.js').Errors; +const FileEntry = require('./file_entry.js'); +const isAnsi = require('./string_util.js').isAnsi; // deps const async = require('async'); diff --git a/mods/system/user_list.js b/core/user_list.js similarity index 91% rename from mods/system/user_list.js rename to core/user_list.js index 7b85b331..be85c586 100644 --- a/mods/system/user_list.js +++ b/core/user_list.js @@ -1,10 +1,10 @@ /* jslint node: true */ 'use strict'; -const MenuModule = require('../../core/menu_module.js').MenuModule; -const User = require('../../core/user.js'); -const ViewController = require('../../core/view_controller.js').ViewController; -const stringFormat = require('../../core/string_format.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const User = require('./user.js'); +const ViewController = require('./view_controller.js').ViewController; +const stringFormat = require('./string_format.js'); const moment = require('moment'); const async = require('async'); diff --git a/mods/system/whos_online.js b/core/whos_online.js similarity index 87% rename from mods/system/whos_online.js rename to core/whos_online.js index cec3bb4b..6abd76ef 100644 --- a/mods/system/whos_online.js +++ b/core/whos_online.js @@ -2,10 +2,10 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../../core/menu_module.js').MenuModule; -const ViewController = require('../../core/view_controller.js').ViewController; -const getActiveNodeList = require('../../core/client_connections.js').getActiveNodeList; -const stringFormat = require('../../core/string_format.js'); +const MenuModule = require('./menu_module.js').MenuModule; +const ViewController = require('./view_controller.js').ViewController; +const getActiveNodeList = require('./client_connections.js').getActiveNodeList; +const stringFormat = require('./string_format.js'); // deps const async = require('async'); diff --git a/mods/user/.keep b/mods/.keep similarity index 100% rename from mods/user/.keep rename to mods/.keep