From 5a08b449c7c7084163831cf43b823ac336879913 Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Sun, 16 Jul 2017 13:10:49 -0700
Subject: [PATCH] Update linktitler for new reddit api

---
 examples/data/config/LinkTitler.json | 8 +++++++-
 examples/docker/Dockerfile           | 2 +-
 pyircbot/modules/LinkTitler.py       | 5 ++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/examples/data/config/LinkTitler.json b/examples/data/config/LinkTitler.json
index fdddd9a..8425a3b 100644
--- a/examples/data/config/LinkTitler.json
+++ b/examples/data/config/LinkTitler.json
@@ -1,4 +1,10 @@
 {
-    "agent": "pyircbot3 by /u/(changeme)",
+    "reddit": {
+        "user_agent": "pyircbot3 by /u/(changeme)",
+        "client_id": "",
+        "client_secret": "",
+        "username": "",
+        "password": ""
+    },
     "youtube_api_key": ""
 }
diff --git a/examples/docker/Dockerfile b/examples/docker/Dockerfile
index 07570c2..eb521c4 100644
--- a/examples/docker/Dockerfile
+++ b/examples/docker/Dockerfile
@@ -8,7 +8,7 @@ RUN sed -i -e 's/archive.ubuntu.com/mirrors.digitalocean.com/' /etc/apt/sources.
     apt-get update && \
     apt-get install -y python3 python3-setuptools python3-requests curl unzip sqlite3 && \
     easy_install3 pip && \
-    pip3 install praw pytz && \
+    pip3 install praw==5.0.1 pytz && \
     cd /tmp && \
     curl -o bitcoinrpc.tar.gz https://codeload.github.com/dpedu/python-bitcoinrpc/tar.gz/master && \
     tar zxvf bitcoinrpc.tar.gz && \
diff --git a/pyircbot/modules/LinkTitler.py b/pyircbot/modules/LinkTitler.py
index 34fa402..d8a90cb 100755
--- a/pyircbot/modules/LinkTitler.py
+++ b/pyircbot/modules/LinkTitler.py
@@ -58,9 +58,8 @@ class LinkTitler(ModuleBase):
                 if submissionId in done:
                     continue
                 done.append(submissionId)
-                # TODO configurable user agent
-                r = praw.Reddit(self.config["agent"])
-                submission = r.get_submission(submission_id=submissionId)
+                r = praw.Reddit(**self.config["reddit"])
+                submission = r.submission(id=submissionId)
                 msg = "👽 \x02\x031,15REDDIT\x0f\x02 :: %(title)s \x02on \x02%(domain)s%(nsfw)s\x02 - points " \
                       "\x02%(points)s\x02 (%(percent)s↑) - comments \x02%(comments)s\x02 -  by \x02%(author)s\x02 on " \
                       "\x02%(date)s\x02" % {