Skip to content
This repository has been archived by the owner on Jun 14, 2023. It is now read-only.

Commit

Permalink
update names and copyright year
Browse files Browse the repository at this point in the history
  • Loading branch information
na-2n committed May 12, 2019
1 parent 87f09f4 commit 2651822
Show file tree
Hide file tree
Showing 154 changed files with 971 additions and 970 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
branch = rewrite-compat
[submodule "backend"]
path = backend
url = https://github.com/noud02/Akatsuki-Backend
url = https://github.com/Kyuubey/Akatsuki-Backend.git
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ install:
- git clone https://github.com/docker-library/official-images.git official-images

before_script:
- image="noud02/akatsuki"
- image="yuwui/akatsuki"
- if [ -n "$TRAVIS_TAG" ]; then
image="$image:$TRAVIS_TAG";
fi
Expand All @@ -43,4 +43,4 @@ after_success:

notifications:
webhooks:
- https://circledisc-kyubey.herokuapp.com/webhook/travis
- https://circledisc-kyubey.herokuapp.com/webhook/travis
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Akatsuki Dockerfile
# Copyright 2018 (c) Noud Kerver
# Copyright 2018-2019 (c) Yui
FROM openjdk:alpine
MAINTAINER Noud Kerver <[email protected]>
MAINTAINER Yui <[email protected]>
MAINTAINER Ayane Satomi <[email protected]>

RUN addgroup -g 1000 java \
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2017-2018 Noud Kerver
Copyright (c) 2017-2019 Yui

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand All @@ -19,4 +19,4 @@
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
OTHER DEALINGS IN THE SOFTWARE.
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
# Akatsuki [![Discord](https://img.shields.io/discord/246729077128429568.svg?style=flat-square)](https://discord.gg/qngdWCZ) [![Travis](https://img.shields.io/travis/noud02/Akatsuki.svg?style=flat-square)](https://travis-ci.org/noud02/Akatsuki) [![Discord Bots](https://discordbots.org/api/widget/status/236829027539746817.svg)](https://discordbots.org/bot/236829027539746817)
# Akatsuki [![Discord](https://img.shields.io/discord/246729077128429568.svg?style=flat-square)](https://discord.gg/qngdWCZ) [![Travis](https://img.shields.io/travis/Kyuubey/Akatsuki.svg?style=flat-square)](https://travis-ci.org/Kyuubey/Akatsuki) [![Discord Bots](https://discordbots.org/api/widget/status/236829027539746817.svg)](https://discordbots.org/bot/236829027539746817)

A multipurpose Discord bot written in Kotlin.

### Downloads

You can download the latest version from my [CI](https://ci.noud02.me/viewLog.html?buildId=lastSuccessful&buildTypeId=Akatsuki_Build&tab=artifacts&guest=1)

### Compiling and running the bot

```bash
# Clone and build
$ git clone https://github.com/noud02/Akatsuki --recrusive && cd Akatsuki
$ git clone https://github.com/Kyuubey/Akatsuki --recrusive && cd Akatsuki
$ ./gradlew clean build

# Config
Expand Down
10 changes: 5 additions & 5 deletions SCRIPT_DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Returns `nil`
Add a role to a member.

```lua
discord.add_role("noud02", "awoo")
discord.add_role("yuwui", "awoo")
```

#### discord.remove_role(member, role)
Expand All @@ -23,7 +23,7 @@ Returns `nil`
Remove a role from a member.

```lua
discord.remove_role("noud02", "owner")
discord.remove_role("yuwui", "owner")
```

#### discord.get_user(user)
Expand All @@ -33,7 +33,7 @@ Returns `{ username, discriminator, avatar_url, nick, mention, owner, id }`
Gets info on a user.

```lua
local user = discord.get_user "noud02"
local user = discord.get_user "yuwui"
```

### Context
Expand All @@ -43,7 +43,7 @@ local user = discord.get_user "noud02"
Returns `{ username, discriminator, avatar_url, nick, mention, owner, id }`

```lua
if ctx.user.username == "noud02" then
if ctx.user.username == "yuwui" then
ctx.send "hello master"
end
```
Expand All @@ -64,4 +64,4 @@ Returns `nil`

```lua
ctx.send "hello world!"
```
```
5 changes: 5 additions & 0 deletions a.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package me.banana.uwu

import me.banana.uwu.Fruit

"meUbananaUuwuUFruit"
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group 'me.noud02'
group 'moe.kyubey'
version '1.0-SNAPSHOT'

buildscript {
Expand All @@ -21,7 +21,7 @@ apply plugin: 'kotlin'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'application'

mainClassName = 'me.noud02.akatsuki.MainKt'
mainClassName = 'moe.kyubey.akatsuki.MainKt'

repositories {
mavenCentral()
Expand Down
4 changes: 2 additions & 2 deletions config.example.env
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BOT_OWNER=155659573515124736::115076505549144067::238394810623459328
BOT_GAMES=game=Use k;help for commands!$type=playing$::game=as an evil creature named Kyubey$type=playing$::game=/人◕ ‿‿ ◕人\$type=watching::game=Join discord.gg/JCQq5nF for support!$type=playing

DATABASE_NAME=kyubey
DATABASE_USER=noud
DATABASE_USER=user
DATABASE_PASS=
DATABASE_HOST=localhost

Expand All @@ -29,4 +29,4 @@ BACKEND_HOST=localhost
BACKEND_SSL=false
BACKEND_PORT=5050

LAVALINK_NODES=url=ws://example.com$password=hunter2
LAVALINK_NODES=url=ws://example.com$password=hunter2
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ version: '3'

services:
akatsuki:
image: noud02/akatsuki:latest
image: yuwui/akatsuki:latest
env_file:
- config.env

akatsuki-backend:
image: noud02/akatsuki-backend:latest
image: yuwui/akatsuki-backend:latest
hostname: backend
ports:
- 5050:5050
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rootProject.name = 'me.noud02.akatsuki'
rootProject.name = 'moe.kyubey.akatsuki'

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,16 +23,16 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki
package moe.kyubey.akatsuki

import io.sentry.Sentry
import lavalink.client.io.Lavalink
import me.aurieh.ares.exposed.async.asyncTransaction
import me.noud02.akatsuki.db.schema.*
import me.noud02.akatsuki.entities.Config
import me.noud02.akatsuki.entities.CoroutineDispatcher
import me.noud02.akatsuki.utils.Logger
import me.noud02.akatsuki.utils.Wolk
import moe.kyubey.akatsuki.db.schema.*
import moe.kyubey.akatsuki.entities.Config
import moe.kyubey.akatsuki.entities.CoroutineDispatcher
import moe.kyubey.akatsuki.utils.Logger
import moe.kyubey.akatsuki.utils.Wolk
import net.dv8tion.jda.bot.sharding.DefaultShardManagerBuilder
import net.dv8tion.jda.bot.sharding.ShardManager
import net.dv8tion.jda.core.AccountType
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,25 +23,25 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki
package moe.kyubey.akatsuki

import gnu.trove.map.hash.TLongObjectHashMap
import io.sentry.Sentry
import io.sentry.event.BreadcrumbBuilder
import io.sentry.event.UserBuilder
import me.aurieh.ares.exposed.async.asyncTransaction
import me.aurieh.ares.utils.ArgParser
import me.noud02.akatsuki.annotations.*
import me.noud02.akatsuki.db.DBGuild
import me.noud02.akatsuki.db.DBUser
import me.noud02.akatsuki.db.DatabaseWrapper
import me.noud02.akatsuki.db.schema.Restrictions
import me.noud02.akatsuki.entities.*
import me.noud02.akatsuki.extensions.UTF8Control
import me.noud02.akatsuki.extensions.searchMembers
import me.noud02.akatsuki.extensions.searchRoles
import me.noud02.akatsuki.extensions.searchTextChannels
import me.noud02.akatsuki.utils.*
import moe.kyubey.akatsuki.annotations.*
import moe.kyubey.akatsuki.db.DBGuild
import moe.kyubey.akatsuki.db.DBUser
import moe.kyubey.akatsuki.db.DatabaseWrapper
import moe.kyubey.akatsuki.db.schema.Restrictions
import moe.kyubey.akatsuki.entities.*
import moe.kyubey.akatsuki.extensions.UTF8Control
import moe.kyubey.akatsuki.extensions.searchMembers
import moe.kyubey.akatsuki.extensions.searchRoles
import moe.kyubey.akatsuki.extensions.searchTextChannels
import moe.kyubey.akatsuki.utils.*
import net.dv8tion.jda.core.Permission
import net.dv8tion.jda.core.entities.Channel
import net.dv8tion.jda.core.events.message.MessageReceivedEvent
Expand All @@ -67,7 +67,7 @@ class CommandHandler {
init { loadAll() }

private fun loadAll() {
Reflections(ConfigurationBuilder().setUrls(ClasspathHelper.forPackage("me.noud02.akatsuki.commands")))
Reflections(ConfigurationBuilder().setUrls(ClasspathHelper.forPackage("moe.kyubey.akatsuki.commands")))
.getSubTypesOf(Command::class.java)
.forEach {
if (!it.isInterface) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,22 +23,22 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki
package moe.kyubey.akatsuki

import gnu.trove.map.hash.TLongLongHashMap
import io.sentry.Sentry
import me.aurieh.ares.core.entities.EventWaiter
import me.aurieh.ares.exposed.async.asyncTransaction
import me.noud02.akatsuki.db.DatabaseWrapper
import me.noud02.akatsuki.db.schema.*
import me.noud02.akatsuki.extensions.UTF8Control
import me.noud02.akatsuki.extensions.addStar
import me.noud02.akatsuki.extensions.log
import me.noud02.akatsuki.extensions.removeStar
import me.noud02.akatsuki.music.MusicManager
import me.noud02.akatsuki.utils.Http
import me.noud02.akatsuki.utils.I18n
import me.noud02.akatsuki.utils.Logger
import moe.kyubey.akatsuki.db.DatabaseWrapper
import moe.kyubey.akatsuki.db.schema.*
import moe.kyubey.akatsuki.extensions.UTF8Control
import moe.kyubey.akatsuki.extensions.addStar
import moe.kyubey.akatsuki.extensions.log
import moe.kyubey.akatsuki.extensions.removeStar
import moe.kyubey.akatsuki.music.MusicManager
import moe.kyubey.akatsuki.utils.Http
import moe.kyubey.akatsuki.utils.I18n
import moe.kyubey.akatsuki.utils.Logger
import net.dv8tion.jda.core.EmbedBuilder
import net.dv8tion.jda.core.JDA
import net.dv8tion.jda.core.audit.ActionType
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,13 +23,13 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki
package moe.kyubey.akatsuki

import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
import com.fasterxml.jackson.module.kotlin.KotlinModule
import com.fasterxml.jackson.module.kotlin.readValue
import me.noud02.akatsuki.entities.*
import moe.kyubey.akatsuki.entities.*
import java.io.File

fun main (args: Array<String>) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,6 +23,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki.annotations
package moe.kyubey.akatsuki.annotations

annotation class Alias(vararg val aliases: String)
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,7 +23,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki.annotations
package moe.kyubey.akatsuki.annotations

@Repeatable
annotation class Argument(val name: String, val type: String, val optional: Boolean = false)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,7 +23,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki.annotations
package moe.kyubey.akatsuki.annotations

@Repeatable
annotation class Flag(val flag: String, val abbr: Char, val desc: String)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,6 +23,6 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki.annotations
package moe.kyubey.akatsuki.annotations

annotation class Load(val bool: Boolean = true)
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2018 Noud Kerver
* Copyright (c) 2017-2019 Yui
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand All @@ -23,7 +23,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

package me.noud02.akatsuki.annotations
package moe.kyubey.akatsuki.annotations

import net.dv8tion.jda.core.Permission

Expand Down
Loading

0 comments on commit 2651822

Please sign in to comment.