Merge branch 'master' into caesar-command

4 files changed, 141 insertions, 24 deletions

diff --git a/bot/resources/easter/starter.json b/bot/resources/easter/starter.json
deleted file mode 100644
index 31e2cbc9..00000000
--- a/bot/resources/easter/starter.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "starters": [
-    "What is your favourite Easter candy or treat?",
-    "What is your earliest memory of Easter?",
-    "What is the title of the last book you read?",
-    "What is better: Milk, Dark or White chocolate?",
-    "What is your favourite holiday?",
-    "If you could have any superpower, what would it be?",
-    "Name one thing you like about a person to your right.",
-    "If you could be anyone else for one day, who would it be?",
-    "What Easter tradition do you enjoy most?",
-    "What is the best gift you've been given?",
-    "Name one famous person you would like to have at your easter dinner.",
-    "What was the last movie you saw in a cinema?",
-    "What is your favourite food?",
-    "If you could travel anywhere in the world, where would you go?",
-    "Tell us 5 things you do well.",
-    "What is your favourite place that you have visited?",
-    "What is your favourite color?",
-    "If you had $100 bill in your Easter Basket, what would you do with it?",
-    "What would you do if you know you could succeed at anything you chose to do?",
-    "If you could take only three things from your house, what would they be?"
-  ]
-}
diff --git a/bot/resources/evergreen/py_topics.yaml b/bot/resources/evergreen/py_topics.yaml
new file mode 100644
index 00000000..1e53429a
--- /dev/null
+++ b/bot/resources/evergreen/py_topics.yaml
@@ -0,0 +1,89 @@
+# Conversation starters for Python-related channels.
+
+# python-general
+267624335836053506:
+    - What's your favorite PEP?
+    - What's your current text editor/IDE, and what functionality do you like about it the most when programming in Python?
+    - What functionality is your text editor/IDE missing for programming Python?
+    - What parts of your life has Python automated, if any?
+    - Which Python project are you the most proud of making?
+    - What made you want to learn Python?
+    - When did you start learning Python?
+    - What reasons are you learning Python for?
+    - Where's the strangest place you've seen Python?
+    - How has learning Python changed your life?
+    - Is there a package you wish existed but doesn't? What is it?
+    - What feature do you think should be added to Python?
+    - Has Python helped you in school? If so, how?
+    - What was the first thing you created with Python?
+
+# async
+630504881542791169:
+    - Are there any frameworks you wish were async?
+    - How have coroutines changed the way you write Python?
+
+# c-extensions
+728390945384431688:
+    -
+
+# computer-science
+650401909852864553:
+    -
+
+# databases
+342318764227821568:
+    - Where do you get your best data?
+
+# data-science
+366673247892275221:
+    -
+
+# discord.py
+343944376055103488:
+    - What unique features does your bot contain, if any?
+    - What commands/features are you proud of making?
+    - What feature would you be the most interested in making?
+    - What feature would you like to see added to the library? what feature in the library do you think is redundant?
+    - Do you think there's a way in which Discord could handle bots better?
+
+# esoteric-python
+470884583684964352:
+    - What's a common part of programming we can make harder?
+    - What are the pros and cons of messing with __magic__()?
+
+# game-development
+660625198390837248:
+    -
+
+# microcontrollers
+545603026732318730:
+    -
+
+# networking
+716325106619777044:
+    - If you could wish for a library involving networking, what would it be?
+
+# security
+366674035876167691:
+    - If you could wish for a library involving net-sec, what would it be?
+
+# software-testing
+463035728335732738:
+    -
+
+# tools-and-devops
+463035462760792066:
+    - What editor would you recommend to a beginner? Why?
+    - What editor would you recommend to be the most efficient? Why?
+
+# unix
+491523972836360192:
+    -
+
+# user-interfaces
+338993628049571840:
+    - What's the most impressive Desktop Application you've made with Python so far?
+
+# web-development
+366673702533988363:
+    - How has Python helped you in web development?
diff --git a/bot/resources/evergreen/starter.yaml b/bot/resources/evergreen/starter.yaml
new file mode 100644
index 00000000..53c89364
--- /dev/null
+++ b/bot/resources/evergreen/starter.yaml
@@ -0,0 +1,22 @@
+# Conversation starters for channels that are not Python-related.
+
+- What is your favourite Easter candy or treat?
+- What is your earliest memory of Easter?
+- What is the title of the last book you read?
+- "What is better: Milk, Dark or White chocolate?"
+- What is your favourite holiday?
+- If you could have any superpower, what would it be?
+- Name one thing you like about a person to your right.
+- If you could be anyone else for one day, who would it be?
+- What Easter tradition do you enjoy most?
+- What is the best gift you've been given?
+- Name one famous person you would like to have at your easter dinner.
+- What was the last movie you saw in a cinema?
+- What is your favourite food?
+- If you could travel anywhere in the world, where would you go?
+- Tell us 5 things you do well.
+- What is your favourite place that you have visited?
+- What is your favourite color?
+- If you had $100 bill in your Easter Basket, what would you do with it?
+- What would you do if you know you could succeed at anything you chose to do?
+- If you could take only three things from your house, what would they be?
diff --git a/bot/resources/evergreen/trivia_quiz.json b/bot/resources/evergreen/trivia_quiz.json
index 6100ca62..8f0a4114 100644
--- a/bot/resources/evergreen/trivia_quiz.json
+++ b/bot/resources/evergreen/trivia_quiz.json
@@ -217,6 +217,36 @@
       "question": "What does the acronym GPRS stand for?",
       "answer": "General Packet Radio Service",
       "info": "General Packet Radio Service (GPRS) is a packet-based mobile data service on the global system for mobile communications (GSM) of 3G and 2G cellular communication systems. It is a non-voice, high-speed and useful packet-switching technology intended for GSM networks."
+    },
+    {
+      "id": 131,
+      "question": "In what country is the Ebro river located?",
+      "answer": "Spain",
+      "info": "The Ebro river is located in Spain. It is 930 kilometers long and it's the second longest river that ends on the Mediterranean Sea."
+    },
+    {
+      "id": 132,
+      "question": "What year was the IBM PC model 5150 introduced into the market?",
+      "answer": "1981",
+      "info": "The IBM PC was introduced into the market in 1981. It used the Intel 8088, with a clock speed of 4.77 MHz, along with the MDA and CGA as a video card."
+    },
+    {
+      "id": 133,
+      "question": "What's the world's largest urban area?",
+      "answer": "Tokyo",
+      "info": "Tokyo is the most populated city in the world, with a population of 37 million people. It is located in Japan."
+    },
+    {
+      "id": 134,
+      "question": "How many planets are there in the Solar system?",
+      "answer": "8",
+      "info": "In the Solar system, there are 8 planets: Mercury, Venus, Earth, Mars, Jupiter, Saturn, Uranus and Neptune. Pluto isn't considered a planet in the Solar System anymore."
+    },
+    {
+      "id": 135,
+      "question": "What is the capital of Iraq?",
+      "answer": "Baghdad",
+      "info": "Baghdad is the capital of Iraq. It has a population of 7 million people."
     }
   ]
 }