Browse Source

Update core naming to make a little more sense

shorten
benji7425 3 years ago
parent
commit
5e0250731c
  1. 2
      app/commands/add-feed.js
  2. 2
      app/commands/remove-feed.js
  3. 2
      app/commands/view-feeds.js
  4. 2
      app/index.js
  5. 4
      app/models/feed-data.js
  6. 2
      app/models/guild-data.js
  7. 0
      core/.gitignore
  8. 0
      core/.gitrepo
  9. 0
      core/.npmrc
  10. 0
      core/LICENSE
  11. 6
      core/README.md
  12. 0
      core/base-embedded-data.js
  13. 0
      core/base-guild-data.js
  14. 0
      core/client.js
  15. 0
      core/command.js
  16. 0
      core/commands/help.js
  17. 0
      core/commands/reset.js
  18. 0
      core/commands/version.js
  19. 2
      core/handle-guild-message.js
  20. 0
      core/index.js
  21. 0
      core/internal-config.json
  22. 0
      core/package-lock.json
  23. 8
      core/package.json
  24. 0
      core/util.js
  25. 2
      package.json

2
app/commands/add-feed.js

@ -1,6 +1,6 @@
const { promisify } = require("util");
const Config = require("../config.json");
const Core = require("../../discord-bot-core");
const Core = require("../../core");
const FeedData = require("../models/feed-data.js");
const GetUrls = require("get-urls");
const ShortID = require("shortid");

2
app/commands/remove-feed.js

@ -1,4 +1,4 @@
const Core = require("../../discord-bot-core");
const Core = require("../../core");
module.exports = new Core.Command({
name: "remove-feed",

2
app/commands/view-feeds.js

@ -1,4 +1,4 @@
const Core = require("../../discord-bot-core");
const Core = require("../../core");
const Config = require("../config.json");
module.exports = new Core.Command({

2
app/index.js

@ -1,4 +1,4 @@
const Core = require("../discord-bot-core");
const Core = require("../core");
const GetUrls = require("get-urls");
const GuildData = require("./models/guild-data.js");
// @ts-ignore

4
app/models/feed-data.js

@ -3,8 +3,8 @@ const Config = require("../config.json");
const { promisify } = require("util");
const Camo = require("camo");
const Core = require("../../discord-bot-core");
const DiscordUtil = require("../../discord-bot-core").util;
const Core = require("../../core");
const DiscordUtil = require("../../core").util;
const GetUrls = require("get-urls");
const Url = require("url");

2
app/models/guild-data.js

@ -1,4 +1,4 @@
const Core = require("../../discord-bot-core");
const Core = require("../../core");
const FeedData = require("./feed-data.js");
module.exports = class GuildData extends Core.BaseGuildData {

0
discord-bot-core/.gitignore → core/.gitignore

0
discord-bot-core/.gitrepo → core/.gitrepo

0
discord-bot-core/.npmrc → core/.npmrc

0
discord-bot-core/LICENSE → core/LICENSE

6
discord-bot-core/README.md → core/README.md

@ -16,12 +16,12 @@ A good candidate is my [template project](https://github.com/benji7425/discord-b
## Contributing
The easiest way to get setup would be a fork of this repo, and the fork of a bot to use as a development context.
I suggest using my [template project](https://github.com/benji7425/discord-bot-template) as a development context, along with [git subrepo](https://github.com/ingydotnet/git-subrepo) to push back to your discord-bot-core fork.
If you are uncomfortable using git subrepo, you could just as easily copy/paste your child `discord-bot-core` directory back into your fork.
I suggest using my [template project](https://github.com/benji7425/discord-bot-template) as a development context, along with [git subrepo](https://github.com/ingydotnet/git-subrepo) to push back to your core fork.
If you are uncomfortable using git subrepo, you could just as easily copy/paste your child `core` directory back into your fork.
My [template project](https://github.com/benji7425/discord-bot-template) has more in-depth details about how to setup and test.
If you have a completed change, please submit a pull request from your `discord-bot-core` fork back to this repo.
If you have a completed change, please submit a pull request from your `core` fork back to this repo.
Whilst this is very easy to use once you know how, I appreciate this might be a little tricky if you aren't familiar with developing in this way.
Feel free to contact me if you would like assistance. Find contact details [here](https://benji7425.github.io/contact).

0
discord-bot-core/base-embedded-data.js → core/base-embedded-data.js

0
discord-bot-core/base-guild-data.js → core/base-guild-data.js

0
discord-bot-core/client.js → core/client.js

0
discord-bot-core/command.js → core/command.js

0
discord-bot-core/core-commands/help.js → core/commands/help.js

0
discord-bot-core/core-commands/reset.js → core/commands/reset.js

0
discord-bot-core/core-commands/version.js → core/commands/version.js

2
discord-bot-core/handle-guild-message.js → core/handle-guild-message.js

@ -1,6 +1,6 @@
const RequireAll = require("require-all");
const internalCommands = RequireAll(__dirname + "/core-commands");
const internalCommands = RequireAll(__dirname + "/commands");
function handleGuildMessage(client, message, commands) {
if (isCommand(message))

0
discord-bot-core/index.js → core/index.js

0
discord-bot-core/internal-config.json → core/internal-config.json

0
discord-bot-core/package-lock.json → core/package-lock.json

8
discord-bot-core/package.json → core/package.json

@ -10,16 +10,16 @@
"require-all": "2.2.0",
"simple-file-writer": "2.0.0"
},
"name": "discord-bot-core",
"name": "core",
"repository": {
"type": "git",
"url": "git+https://github.com/benji7425/discord-bot-core.git"
"url": "git+https://github.com/benji7425/core.git"
},
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/benji7425/discord-bot-core/issues"
"url": "https://github.com/benji7425/core/issues"
},
"homepage": "https://github.com/benji7425/discord-bot-core#readme",
"homepage": "https://github.com/benji7425/core#readme",
"description": "Core code shared amongst my Discord bots"
}

0
discord-bot-core/util.js → core/util.js

2
package.json

@ -2,7 +2,7 @@
"version": "3.5.0-b3",
"main": "app/index.js",
"scripts": {
"postinstall": "cd ./discord-bot-core && npm install",
"postinstall": "cd ./core && npm install",
"start": "node ./app/index.js --name=rss-feed"
},
"dependencies": {

Loading…
Cancel
Save