diff options
| -rw-r--r-- | bucky/db/index.js | 2 | ||||
| -rw-r--r-- | public/assets/js/lib/router.js | 6 | ||||
| -rw-r--r-- | views/partials/hootstream.ejs | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/bucky/db/index.js b/bucky/db/index.js index 2a1a3bf..2e6deab 100644 --- a/bucky/db/index.js +++ b/bucky/db/index.js @@ -129,7 +129,7 @@ db.getHootstreamFiles = ({ limit, offset, thread, keyword, username }) => builder.where("threads.id", thread); } if (username) { - builder.where("comments.username", username); + builder.where("files.username", username); } }) .orderBy("files.id", "desc") diff --git a/public/assets/js/lib/router.js b/public/assets/js/lib/router.js index 848c813..b6e29be 100644 --- a/public/assets/js/lib/router.js +++ b/public/assets/js/lib/router.js @@ -8,10 +8,10 @@ var SiteRouter = Router.extend({ "/stream": "stream", "/stream/thread": "stream", "/stream/thread/:id": "streamThread", - "/stream/keyword": "streamKeyword", + "/stream/keyword": "stream", "/stream/keyword/:keyword": "streamKeyword", - "/stream/profile": "streamProfile", - "/stream/profile/:username": "streamItem", + "/stream/profile": "stream", + "/stream/profile/:username": "streamProfile", "/login": "login", "/logout": "logout", "/signup": "signup", diff --git a/views/partials/hootstream.ejs b/views/partials/hootstream.ejs index b94d62c..86282aa 100644 --- a/views/partials/hootstream.ejs +++ b/views/partials/hootstream.ejs @@ -10,10 +10,10 @@ </div> <script class="hootTemplate" type="text/html"> <div class="{{className}}"> - <a class="userLink" href="/stream/username/{{username}}" style="opacity: {{age_opacity}}"> + <a class="userLink" href="/stream/profile/{{username}}" style="opacity: {{age_opacity}}"> {{username}} </a> - <a class="avatarLink" href="/stream/username/{{username}}" style="opacity: {{age_opacity}}"> + <a class="avatarLink" href="/stream/profile/{{username}}" style="opacity: {{age_opacity}}"> <div class="avatar" title="{{username}}" style="background-image:url({{image}});opacity:{{showAvatar}};"></div> </a> <div class="text" style="opacity: {{age_opacity}}">{{hoot}}</div> @@ -23,10 +23,10 @@ <script class="threadTemplate" type="text/html"> <div class="{{className}}"> - <a class="userLink" href="/stream/username/{{username}}" style="opacity: {{age_opacity}}"> + <a class="userLink" href="/stream/profile/{{username}}" style="opacity: {{age_opacity}}"> {{username}} </a> - <a class="avatarLink" href="/stream/username/{{username}}" style="opacity: {{age_opacity}}"> + <a class="avatarLink" href="/stream/profile/{{username}}" style="opacity: {{age_opacity}}"> <div class="avatar" title="{{username}}" style="background-image:url({{image}});opacity:{{showAvatar}};"></div> </a> <div class="text" style="opacity: {{age_opacity}}">{{hoot}}</div> @@ -39,7 +39,7 @@ <script class="lastlogTemplate" type="text/html"> <div class="{{className}}" style="opacity: {{opacity}}"> - <a class="userLink" href="/stream/username/{{username}}"> + <a class="userLink" href="/stream/profile/{{username}}"> {{username}} </a> <div class="text">{{hoot}}</div> |