[geany/www.geany.org] ba2508: Merge pull request #30 from geany/remove_irc

Geany Administrator git-noreply at xxxxx
Mon Jun 21 20:43:34 UTC 2021


Branch:      refs/heads/master
Author:      Geany Administrator <geanyadmin at users.noreply.github.com>
Committer:   GitHub <noreply at github.com>
Date:        Mon, 21 Jun 2021 20:43:34 UTC
Commit:      ba2508a4bd9fd81a620e3efae94cbef0bc57f79b
             https://github.com/geany/www.geany.org/commit/ba2508a4bd9fd81a620e3efae94cbef0bc57f79b

Log Message:
-----------
Merge pull request #30 from geany/remove_irc

Bye bye IRC @ Freenode, RIP.


Modified Paths:
--------------
    README.dev.md
    README.md
    docker/Dockerfile
    docker/local_settings.docker.py
    geany/settings.py
    geany/templates/home.html
    geany/templates/pages/support/irc.html
    geany/templatetags/geany_tags.py
    geany/urls_legacy.py
    page_content/about/geany.md
    page_content/contribute/support.md
    page_content/support.md
    page_content/support/irc.md

Modified: README.dev.md
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -114,7 +114,6 @@ the settings to your needs:
     LATEST_VERSION_RELEASES_DIRECTORY = '/path/to/geany/releases/directory/or/just/empty'
     LATEST_VERSION_PLUGINS_RELEASES_DIRECTORY = '/path/to/plugins/releases/directory/or/just/empty'
     STATIC_DOCS_GEANY_SOURCE_TARBALL = '/path/to/geany/source/tarball/or/just/empty'
-    IRC_USER_LIST_FILE = '/path/to/irc/data/or/just/empty'
 
 
 ### Database settings


Modified: README.md
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -55,7 +55,6 @@ with non-static content.
   * documentation/todo.md: generated from Github upon request
   * download/nightly-builds.md: generated upon request
   * fake.md: dummy page for various non-CMS pages like pastebin.geany.org and more
-  * support/irc.md: dynamic content is added to the page upon request
 
 #### Supported Markdown Extensions
 


Modified: docker/Dockerfile
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -95,7 +95,7 @@ USER nobody:nogroup
 # copy in Python environment
 COPY --from=builder /venv /venv
 # copy helpers and configs
-COPY ./docker/entrypoint.sh ./docker/irc_userlist /data/
+COPY ./docker/entrypoint.sh /data/
 
 EXPOSE 8000
 CMD ["/bin/bash", "/data/entrypoint.sh"]


Modified: docker/local_settings.docker.py
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -48,7 +48,6 @@
 DEFAULT_FROM_EMAIL = 'root at localhost'
 
 NIGHTLYBUILDS_BASE_DIR = os.path.join(MEDIA_ROOT, 'nightly_mirror')
-IRC_USER_LIST_FILE = '/data/irc_userlist'
 
 STATIC_DOCS_GEANY_SOURCE_TARBALL = '/tmp/geany_git.tar.gz'
 STATIC_DOCS_GEANY_DESTINATION_DIR = os.path.join(MEDIA_ROOT, 'i18n')


Modified: geany/settings.py
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -461,8 +461,6 @@
 STATIC_DOCS_GEANY_DESTINATION_URL = os.path.join(MEDIA_URL, 'i18n')
 STATIC_DOCS_GEANY_I18N_STATISTICS_FILENAME = 'i18n_statistics.json'
 
-IRC_USER_LIST_FILE = '/srv/tmp/irc_userlist'
-
 LATEST_VERSION_RELEASES_DIRECTORY = '/srv/www/download.geany.org'
 LATEST_VERSION_PLUGINS_RELEASES_DIRECTORY = '/srv/www/plugins.geany.org/geany-plugins/'
 


Modified: geany/templates/home.html
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -137,7 +137,6 @@ <h2 class="text-center">Great Community</h2>
 			that contribute improvements and fixes across numerous
 			platforms including
 			<a href="{% url "page" "support/mailing-lists" %}">The Mailing Lists</a>,
-			<a href="{% url "page" "support/irc" %}">IRC</a>,
 			<a href="https://github.com/geany">Github</a> and
 			<a href="https://twitter.com/GeanyIDE/">Twitter</a>.</p>
 			<p><a class="btn btn-default" href="{% url "page" "contribute" %}">Get Involved »</a>


Modified: geany/templates/pages/support/irc.html
25 lines changed, 0 insertions(+), 25 deletions(-)
===================================================================
@@ -1,25 +0,0 @@
-{% extends "pages/richtextpage.html" %}
-
-{% load geany_tags %}
-
-{% block content_after %}
-
-{% get_irc_userlist as irc_userlist %}
-
-<h2>Users</h2>
-
-<p>Currently {{ irc_userlist|length }} users are connected:</p>
-
-<div class="row">
-{% for username in irc_userlist %}
-    <div class="col-md-2">{{ username }}</div>
-
-    {% if forloop.counter|divisibleby:4 %}
-        </div>
-        <div class="row">
-    {% endif %}
-{% endfor %}
-</div>
-
-
-{% endblock %}


Modified: geany/templatetags/geany_tags.py
16 lines changed, 0 insertions(+), 16 deletions(-)
===================================================================
@@ -15,7 +15,6 @@
 import logging
 
 from django import template
-from django.conf import settings
 from mezzanine.template import Library
 
 
@@ -58,21 +57,6 @@ def do_evaluate(parser, token):  # pylint: disable=unused-argument
     return EvaluateNode(variable, target_var_name)
 
 
-# ----------------------------------------------------------------------
- at register.simple_tag
-def get_irc_userlist():
-    user_list = list()
-    try:
-        with open(settings.IRC_USER_LIST_FILE) as file_h:
-            user_list = file_h.readlines()
-    except IOError as exc:
-        logger.error('An error occurred reading IRC user list: {}'.format(exc), exc_info=True)
-
-    # remove newline characters
-    user_list = [username.strip() for username in user_list]
-    return sorted(user_list)
-
-
 # ----------------------------------------------------------------------
 @register.filter(name='add_css')
 def add_css(field, css):


Modified: geany/urls_legacy.py
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -71,7 +71,8 @@
     '/Support/Developers': '/contribute/development/',
     '/Support/Hacking': '/documentation/hacking/',
     '/Support/I18N': '/contribute/translation/',
-    '/Support/IRC': '/support/irc/',
+    '/Support/IRC': '/support/',
+    '/support/irc/': '/support/',
     '/Support/MailingList': '/support/mailing-lists/',
     '/Support/PluginWishlist/':
         'https://github.com/geany/geany-plugins/issues?q=is%%3Aissue+label%%3Afeature+',


Modified: page_content/about/geany.md
6 lines changed, 2 insertions(+), 4 deletions(-)
===================================================================
@@ -35,12 +35,10 @@ The code is licensed under the terms of the [GNU General Public Licence][3].
 
 ## Contact
 
-To contact us for general questions or feedback, either use one of our [mailing lists][4], the [IRC channel][5] or the [Github issue tracker][6].
-
+To contact us for general questions or feedback, either use one of our [mailing lists][4] or the [Github issue tracker][5].
 
   [1]: /about/filetypes/
   [2]: /support/plugins/
   [3]: https://www.gnu.org/licenses/gpl-2.0.en.html
   [4]: /support/mailing-lists
-  [5]: /support/irc
-  [6]: https://github.com/geany/geany/issues
+  [5]: https://github.com/geany/geany/issues


Modified: page_content/contribute/support.md
9 lines changed, 2 insertions(+), 7 deletions(-)
===================================================================
@@ -9,19 +9,14 @@ There are different ways you can support Geany users. Yes, even supporting users
 
 You can subscribe to the [Geany Users mailing list][1] and answer questions, give hints to people who write there and so on.
 
-### IRC
-
-There are many people who join IRC and ask questions. You can join us on [#geany][2] on chat.freenode.net and help out answering questions there.
-
 ### Bug Zapping
 
-You can also surf through the bugs reported at the [Github issue tracker][3] and see if you maybe can help users. Some issues reported are not actually bugs and maybe can be solved with your help.
+You can also surf through the bugs reported at the [Github issue tracker][2] and see if you maybe can help users. Some issues reported are not actually bugs and maybe can be solved with your help.
 
 ### Twitter
 
 Geany's twitter stream: https://twitter.com/GeanyIDE/
 
 
   [1]: /support/mailing-lists/
-  [2]: irc://chat.freenode.net/geany%7C#geany
-  [3]: https://github.com/geany/geany/issues
+  [2]: https://github.com/geany/geany/issues


Modified: page_content/support.md
6 lines changed, 2 insertions(+), 4 deletions(-)
===================================================================
@@ -4,10 +4,8 @@ Support
 There are multiple ways to get support on using Geany and/or ask questions:
 
 - [Mailing Lists][1]
-- [IRC (chat)][2]
-- [Issue tracker / Bugs][3]
+- [Issue tracker / Bugs][2]
 
 
 [1]: /support/mailing-lists/
-[2]: /support/irc/
-[3]: /support/bugs/
+[2]: /support/bugs/


Modified: page_content/support/irc.md
12 lines changed, 0 insertions(+), 12 deletions(-)
===================================================================
@@ -1,12 +0,0 @@
-IRC chat
-==========
-
-If you have a problem, a question or anything else to talk about, join our IRC channel irc://chat.freenode.net/geany|#geany on chat.freenode.net.
-
-**Due to spam, as of 2018-08-01, you need to be registered and identified** with Freenode's account service to speak in geany-affiliated channels.
-
-Follow freenode's instructions: <https://freenode.net/kb/answer/registration>.
-
-IRC channel logs: https://irc.geany.org/logs/.
-
-IRC channel stats: https://irc.geany.org/stats/.



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list