From bf2a5e9b3495912bc4e266052e15cceedab131cf Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 17 Jan 2019 14:13:25 +0200 Subject: [PATCH] Update license and sort imports --- LICENSE | 147 ++++++++---------- config/config.go | 15 +- config/config_test.go | 10 +- debug/debug.go | 13 +- go.mod | 6 + gomuks.go | 10 +- interface/gomuks.go | 10 +- interface/matrix.go | 11 +- interface/ui.go | 13 +- lib/bfhtml/html.go | 10 +- lib/notification/notify_darwin.go | 10 +- lib/notification/notify_linux.go | 10 +- lib/notification/notify_unsupported.go | 10 +- lib/notification/notify_windows.go | 10 +- lib/open/open.go | 10 +- lib/open/open_darwin.go | 10 +- lib/open/open_windows.go | 10 +- main.go | 10 +- matrix/matrix.go | 21 +-- matrix/matrix_test.go | 10 +- matrix/pushrules/action.go | 10 +- matrix/pushrules/action_test.go | 10 +- matrix/pushrules/condition.go | 11 +- .../pushrules/condition_displayname_test.go | 10 +- matrix/pushrules/condition_eventmatch_test.go | 10 +- .../pushrules/condition_membercount_test.go | 10 +- matrix/pushrules/condition_test.go | 10 +- matrix/pushrules/pushrules_test.go | 10 +- matrix/pushrules/rule.go | 12 +- matrix/pushrules/rule_array_test.go | 10 +- matrix/pushrules/rule_test.go | 10 +- matrix/pushrules/ruleset.go | 10 +- matrix/rooms/room.go | 15 +- matrix/rooms/room_test.go | 10 +- matrix/sync.go | 15 +- matrix/sync_test.go | 10 +- ui/command-processor.go | 13 +- ui/commands.go | 16 +- ui/fuzzy-search-modal.go | 16 +- ui/message-view.go | 16 +- ui/messages/base.go | 15 +- ui/messages/expandedtextmessage.go | 13 +- ui/messages/imagemessage.go | 16 +- ui/messages/message.go | 10 +- ui/messages/meta.go | 10 +- ui/messages/parser/htmlparser.go | 18 ++- ui/messages/parser/parser.go | 10 +- ui/messages/textbase.go | 13 +- ui/messages/textmessage.go | 13 +- ui/messages/tstring/cell.go | 11 +- ui/messages/tstring/string.go | 13 +- ui/room-list.go | 16 +- ui/room-view.go | 20 +-- ui/tag-room-list.go | 15 +- ui/ui.go | 16 +- ui/view-login.go | 15 +- ui/view-main.go | 20 +-- ui/widget/advanced-inputfield.go | 11 +- ui/widget/border.go | 10 +- ui/widget/center.go | 10 +- ui/widget/color.go | 10 +- ui/widget/form-text-view.go | 10 +- ui/widget/util.go | 10 +- 63 files changed, 459 insertions(+), 436 deletions(-) diff --git a/LICENSE b/LICENSE index 94a9ed0..be3f7b2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,23 +1,21 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/config/config.go b/config/config.go index 8f45d76..0ddb4a3 100644 --- a/config/config.go +++ b/config/config.go @@ -1,31 +1,32 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package config import ( + "encoding/json" "io/ioutil" "os" "path/filepath" - - "encoding/json" "strings" "gopkg.in/yaml.v2" + "maunium.net/go/mautrix" + "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/matrix/pushrules" "maunium.net/go/gomuks/matrix/rooms" diff --git a/config/config_test.go b/config/config_test.go index ae7e725..f782618 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package config_test diff --git a/debug/debug.go b/debug/debug.go index 9ed8a09..be3d925 100644 --- a/debug/debug.go +++ b/debug/debug.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package debug @@ -22,9 +22,8 @@ import ( "io" "io/ioutil" "os" - "time" - "runtime/debug" + "time" ) var writer io.Writer diff --git a/go.mod b/go.mod index 1934c0d..98c3c35 100644 --- a/go.mod +++ b/go.mod @@ -17,3 +17,9 @@ require ( maunium.net/go/tcell v0.0.0-20190111223412-5e74142cb009 maunium.net/go/tview v0.0.0-20190111223510-de38190b095b ) + +replace maunium.net/go/tcell => ../../Go/tcell + +replace maunium.net/go/tview => ../../Go/tview + +replace maunium.net/go/mautrix => ../mautrix-go diff --git a/gomuks.go b/gomuks.go index b668324..3e30035 100644 --- a/gomuks.go +++ b/gomuks.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package main diff --git a/interface/gomuks.go b/interface/gomuks.go index 90a5c4c..f2565fb 100644 --- a/interface/gomuks.go +++ b/interface/gomuks.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ifc diff --git a/interface/matrix.go b/interface/matrix.go index 01f224e..2f457bf 100644 --- a/interface/matrix.go +++ b/interface/matrix.go @@ -1,23 +1,24 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ifc import ( "maunium.net/go/mautrix" + "maunium.net/go/gomuks/matrix/rooms" ) diff --git a/interface/ui.go b/interface/ui.go index 885bb0a..9091e36 100644 --- a/interface/ui.go +++ b/interface/ui.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ifc @@ -20,9 +20,10 @@ import ( "time" "maunium.net/go/mautrix" + "maunium.net/go/tcell" + "maunium.net/go/gomuks/matrix/pushrules" "maunium.net/go/gomuks/matrix/rooms" - "maunium.net/go/tcell" ) type UIProvider func(gmx Gomuks) GomuksUI diff --git a/lib/bfhtml/html.go b/lib/bfhtml/html.go index 3faedf7..cfffb96 100644 --- a/lib/bfhtml/html.go +++ b/lib/bfhtml/html.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package bfhtml diff --git a/lib/notification/notify_darwin.go b/lib/notification/notify_darwin.go index 0a7e49b..51f1d12 100644 --- a/lib/notification/notify_darwin.go +++ b/lib/notification/notify_darwin.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package notification diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go index 11a37a7..803f80d 100644 --- a/lib/notification/notify_linux.go +++ b/lib/notification/notify_linux.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package notification diff --git a/lib/notification/notify_unsupported.go b/lib/notification/notify_unsupported.go index 0b350e8..f55eaa0 100644 --- a/lib/notification/notify_unsupported.go +++ b/lib/notification/notify_unsupported.go @@ -1,20 +1,20 @@ // +build !linux,!darwin,!windows // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package notification diff --git a/lib/notification/notify_windows.go b/lib/notification/notify_windows.go index 999380a..5f99135 100644 --- a/lib/notification/notify_windows.go +++ b/lib/notification/notify_windows.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package notification diff --git a/lib/open/open.go b/lib/open/open.go index 3fde8e3..fa32ed0 100644 --- a/lib/open/open.go +++ b/lib/open/open.go @@ -1,20 +1,20 @@ // +build !windows,!darwin // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package open diff --git a/lib/open/open_darwin.go b/lib/open/open_darwin.go index 9f53ef5..1d54c5f 100644 --- a/lib/open/open_darwin.go +++ b/lib/open/open_darwin.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package open diff --git a/lib/open/open_windows.go b/lib/open/open_windows.go index 374ad21..b28518d 100644 --- a/lib/open/open_windows.go +++ b/lib/open/open_windows.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package open diff --git a/main.go b/main.go index f9955a1..26762f9 100644 --- a/main.go +++ b/main.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package main diff --git a/matrix/matrix.go b/matrix/matrix.go index b119fc9..cb986ee 100644 --- a/matrix/matrix.go +++ b/matrix/matrix.go @@ -1,27 +1,28 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package matrix import ( "bytes" + "crypto/tls" + "encoding/json" "fmt" "io" "io/ioutil" - "maunium.net/go/mautrix/format" "net/http" "net/url" "os" @@ -31,17 +32,17 @@ import ( "strings" "time" - "crypto/tls" - "encoding/json" - "github.com/russross/blackfriday/v2" + + "maunium.net/go/mautrix" + "maunium.net/go/mautrix/format" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/interface" "maunium.net/go/gomuks/lib/bfhtml" "maunium.net/go/gomuks/matrix/pushrules" "maunium.net/go/gomuks/matrix/rooms" - "maunium.net/go/mautrix" ) // Container is a wrapper for a mautrix Client and some other stuff. diff --git a/matrix/matrix_test.go b/matrix/matrix_test.go index 21ba34e..f66c836 100644 --- a/matrix/matrix_test.go +++ b/matrix/matrix_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package matrix diff --git a/matrix/pushrules/action.go b/matrix/pushrules/action.go index 64dfddd..4637950 100644 --- a/matrix/pushrules/action.go +++ b/matrix/pushrules/action.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules diff --git a/matrix/pushrules/action_test.go b/matrix/pushrules/action_test.go index 41a1056..79b2fdf 100644 --- a/matrix/pushrules/action_test.go +++ b/matrix/pushrules/action_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules_test diff --git a/matrix/pushrules/condition.go b/matrix/pushrules/condition.go index d547a3f..12fd3f3 100644 --- a/matrix/pushrules/condition.go +++ b/matrix/pushrules/condition.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules @@ -22,6 +22,7 @@ import ( "strings" "maunium.net/go/mautrix" + "maunium.net/go/gomuks/lib/glob" ) diff --git a/matrix/pushrules/condition_displayname_test.go b/matrix/pushrules/condition_displayname_test.go index 0ae85d1..fd3f374 100644 --- a/matrix/pushrules/condition_displayname_test.go +++ b/matrix/pushrules/condition_displayname_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules_test diff --git a/matrix/pushrules/condition_eventmatch_test.go b/matrix/pushrules/condition_eventmatch_test.go index 0591656..e5761fc 100644 --- a/matrix/pushrules/condition_eventmatch_test.go +++ b/matrix/pushrules/condition_eventmatch_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules_test diff --git a/matrix/pushrules/condition_membercount_test.go b/matrix/pushrules/condition_membercount_test.go index 32a776b..ad5da9f 100644 --- a/matrix/pushrules/condition_membercount_test.go +++ b/matrix/pushrules/condition_membercount_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules_test diff --git a/matrix/pushrules/condition_test.go b/matrix/pushrules/condition_test.go index 4e8e8a1..163c964 100644 --- a/matrix/pushrules/condition_test.go +++ b/matrix/pushrules/condition_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules_test diff --git a/matrix/pushrules/pushrules_test.go b/matrix/pushrules/pushrules_test.go index c56fd10..1883c97 100644 --- a/matrix/pushrules/pushrules_test.go +++ b/matrix/pushrules/pushrules_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules_test diff --git a/matrix/pushrules/rule.go b/matrix/pushrules/rule.go index 62318ac..ef43721 100644 --- a/matrix/pushrules/rule.go +++ b/matrix/pushrules/rule.go @@ -1,24 +1,26 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules import ( "encoding/gob" + "maunium.net/go/mautrix" + "maunium.net/go/gomuks/lib/glob" ) diff --git a/matrix/pushrules/rule_array_test.go b/matrix/pushrules/rule_array_test.go index 5a5bd3d..8bfc5e9 100644 --- a/matrix/pushrules/rule_array_test.go +++ b/matrix/pushrules/rule_array_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules_test diff --git a/matrix/pushrules/rule_test.go b/matrix/pushrules/rule_test.go index aad6a77..56d48fd 100644 --- a/matrix/pushrules/rule_test.go +++ b/matrix/pushrules/rule_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules_test diff --git a/matrix/pushrules/ruleset.go b/matrix/pushrules/ruleset.go index 366702e..33036c4 100644 --- a/matrix/pushrules/ruleset.go +++ b/matrix/pushrules/ruleset.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package pushrules diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go index 628a0e3..16d4a9e 100644 --- a/matrix/rooms/room.go +++ b/matrix/rooms/room.go @@ -1,31 +1,32 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package rooms import ( + "encoding/gob" "fmt" + "os" "sort" "sync" "time" - "encoding/gob" "maunium.net/go/mautrix" + "maunium.net/go/gomuks/debug" - "os" ) func init() { diff --git a/matrix/rooms/room_test.go b/matrix/rooms/room_test.go index 891e541..a1fc4a4 100644 --- a/matrix/rooms/room_test.go +++ b/matrix/rooms/room_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package rooms_test diff --git a/matrix/sync.go b/matrix/sync.go index fc426bc..837a340 100644 --- a/matrix/sync.go +++ b/matrix/sync.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . // Based on https://github.com/matrix-org/mautrix/blob/master/sync.go @@ -20,11 +20,12 @@ package matrix import ( "encoding/json" - "maunium.net/go/gomuks/debug" "time" - "maunium.net/go/gomuks/matrix/rooms" "maunium.net/go/mautrix" + + "maunium.net/go/gomuks/debug" + "maunium.net/go/gomuks/matrix/rooms" ) type SyncerSession interface { diff --git a/matrix/sync_test.go b/matrix/sync_test.go index d3ae15e..4b85a75 100644 --- a/matrix/sync_test.go +++ b/matrix/sync_test.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package matrix_test diff --git a/ui/command-processor.go b/ui/command-processor.go index eb24f19..0aed4b2 100644 --- a/ui/command-processor.go +++ b/ui/command-processor.go @@ -1,27 +1,28 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui import ( "fmt" + "strings" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/interface" - "strings" ) type gomuksPointerContainer struct { diff --git a/ui/commands.go b/ui/commands.go index 50aedd2..12a99de 100644 --- a/ui/commands.go +++ b/ui/commands.go @@ -1,30 +1,32 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui import ( "encoding/json" "fmt" - "maunium.net/go/mautrix" - "maunium.net/go/mautrix/format" "strings" "unicode" "github.com/lucasb-eyer/go-colorful" + + "maunium.net/go/mautrix" + "maunium.net/go/mautrix/format" + "maunium.net/go/gomuks/debug" ) diff --git a/ui/fuzzy-search-modal.go b/ui/fuzzy-search-modal.go index b58a367..995b4ba 100644 --- a/ui/fuzzy-search-modal.go +++ b/ui/fuzzy-search-modal.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui @@ -22,11 +22,13 @@ import ( "strconv" "github.com/lithammer/fuzzysearch/fuzzy" + + "maunium.net/go/tcell" + "maunium.net/go/tview" + "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/matrix/rooms" "maunium.net/go/gomuks/ui/widget" - "maunium.net/go/tcell" - "maunium.net/go/tview" ) type FuzzySearchModal struct { diff --git a/ui/message-view.go b/ui/message-view.go index 2dffa57..4af0ba9 100644 --- a/ui/message-view.go +++ b/ui/message-view.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui @@ -24,6 +24,10 @@ import ( "strings" "github.com/mattn/go-runewidth" + + "maunium.net/go/tcell" + "maunium.net/go/tview" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/interface" @@ -31,8 +35,6 @@ import ( "maunium.net/go/gomuks/ui/messages" "maunium.net/go/gomuks/ui/messages/tstring" "maunium.net/go/gomuks/ui/widget" - "maunium.net/go/tcell" - "maunium.net/go/tview" ) type MessageView struct { diff --git a/ui/messages/base.go b/ui/messages/base.go index 441aca1..ba1902d 100644 --- a/ui/messages/base.go +++ b/ui/messages/base.go @@ -1,31 +1,32 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package messages import ( "encoding/gob" - "maunium.net/go/mautrix" "time" + "maunium.net/go/mautrix" + "maunium.net/go/tcell" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/interface" "maunium.net/go/gomuks/ui/messages/tstring" "maunium.net/go/gomuks/ui/widget" - "maunium.net/go/tcell" ) func init() { diff --git a/ui/messages/expandedtextmessage.go b/ui/messages/expandedtextmessage.go index fbb373d..d889771 100644 --- a/ui/messages/expandedtextmessage.go +++ b/ui/messages/expandedtextmessage.go @@ -1,26 +1,27 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package messages import ( "encoding/gob" - "maunium.net/go/mautrix" "time" + "maunium.net/go/mautrix" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/ui/messages/tstring" ) diff --git a/ui/messages/imagemessage.go b/ui/messages/imagemessage.go index 8ccff67..0efe676 100644 --- a/ui/messages/imagemessage.go +++ b/ui/messages/imagemessage.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package messages @@ -20,17 +20,17 @@ import ( "bytes" "encoding/gob" "fmt" - "maunium.net/go/mautrix" + "image/color" "time" - "image/color" + "maunium.net/go/mautrix" + "maunium.net/go/tcell" "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/interface" "maunium.net/go/gomuks/lib/ansimage" "maunium.net/go/gomuks/ui/messages/tstring" - "maunium.net/go/tcell" ) func init() { diff --git a/ui/messages/message.go b/ui/messages/message.go index b5ef1b8..076cd87 100644 --- a/ui/messages/message.go +++ b/ui/messages/message.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package messages diff --git a/ui/messages/meta.go b/ui/messages/meta.go index 23a52e9..0712be1 100644 --- a/ui/messages/meta.go +++ b/ui/messages/meta.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package messages diff --git a/ui/messages/parser/htmlparser.go b/ui/messages/parser/htmlparser.go index 850dc52..ddf6d36 100644 --- a/ui/messages/parser/htmlparser.go +++ b/ui/messages/parser/htmlparser.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package parser @@ -20,16 +20,18 @@ import ( "fmt" "math" "regexp" + "strconv" "strings" "github.com/lucasb-eyer/go-colorful" "golang.org/x/net/html" + + "maunium.net/go/mautrix" + "maunium.net/go/tcell" + "maunium.net/go/gomuks/matrix/rooms" "maunium.net/go/gomuks/ui/messages/tstring" "maunium.net/go/gomuks/ui/widget" - "maunium.net/go/mautrix" - "maunium.net/go/tcell" - "strconv" ) var matrixToURL = regexp.MustCompile("^(?:https?://)?(?:www\\.)?matrix\\.to/#/([#@!].*)") diff --git a/ui/messages/parser/parser.go b/ui/messages/parser/parser.go index 05dd0e9..94ab5b6 100644 --- a/ui/messages/parser/parser.go +++ b/ui/messages/parser/parser.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package parser diff --git a/ui/messages/textbase.go b/ui/messages/textbase.go index 4b242b4..01e7b5c 100644 --- a/ui/messages/textbase.go +++ b/ui/messages/textbase.go @@ -1,26 +1,27 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package messages import ( "fmt" + "regexp" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/ui/messages/tstring" - "regexp" ) // Regular expressions used to split lines when calculating the buffer. diff --git a/ui/messages/textmessage.go b/ui/messages/textmessage.go index 8622c32..8ce9482 100644 --- a/ui/messages/textmessage.go +++ b/ui/messages/textmessage.go @@ -1,27 +1,28 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package messages import ( "encoding/gob" "fmt" - "maunium.net/go/mautrix" "time" + "maunium.net/go/mautrix" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/interface" "maunium.net/go/gomuks/ui/messages/tstring" diff --git a/ui/messages/tstring/cell.go b/ui/messages/tstring/cell.go index c3e22a3..aee1716 100644 --- a/ui/messages/tstring/cell.go +++ b/ui/messages/tstring/cell.go @@ -1,23 +1,24 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package tstring import ( "github.com/mattn/go-runewidth" + "maunium.net/go/tcell" ) diff --git a/ui/messages/tstring/string.go b/ui/messages/tstring/string.go index 3de876f..7feeda0 100644 --- a/ui/messages/tstring/string.go +++ b/ui/messages/tstring/string.go @@ -1,27 +1,28 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package tstring import ( "strings" + "unicode" "github.com/mattn/go-runewidth" + "maunium.net/go/tcell" - "unicode" ) type TString []Cell diff --git a/ui/room-list.go b/ui/room-list.go index d82f870..a3ae17e 100644 --- a/ui/room-list.go +++ b/ui/room-list.go @@ -1,31 +1,31 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui import ( + "math" "regexp" "strings" - "math" + "maunium.net/go/tcell" + "maunium.net/go/tview" "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/matrix/rooms" - "maunium.net/go/tcell" - "maunium.net/go/tview" ) type RoomList struct { diff --git a/ui/room-view.go b/ui/room-view.go index a978346..67d4e83 100644 --- a/ui/room-view.go +++ b/ui/room-view.go @@ -1,24 +1,23 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui import ( "fmt" - "maunium.net/go/mautrix" "path/filepath" "sort" "strconv" @@ -26,14 +25,17 @@ import ( "time" "github.com/mattn/go-runewidth" + + "maunium.net/go/mautrix" + "maunium.net/go/tcell" + "maunium.net/go/tview" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/interface" "maunium.net/go/gomuks/lib/util" "maunium.net/go/gomuks/matrix/rooms" "maunium.net/go/gomuks/ui/messages" "maunium.net/go/gomuks/ui/widget" - "maunium.net/go/tcell" - "maunium.net/go/tview" ) type RoomView struct { @@ -155,7 +157,7 @@ func (view *RoomView) GetStatus() string { var buf strings.Builder if len(view.completions.list) > 0 { - if view.completions.textCache != view.input.GetText() || view.completions.time.Add(10*time.Second).Before(time.Now()) { + if view.completions.textCache != view.input.GetText() || view.completions.time.Add(10 * time.Second).Before(time.Now()) { view.completions.list = []string{} } else { buf.WriteString(strings.Join(view.completions.list, ", ")) diff --git a/ui/tag-room-list.go b/ui/tag-room-list.go index 60b4350..3c30914 100644 --- a/ui/tag-room-list.go +++ b/ui/tag-room-list.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui @@ -21,10 +21,11 @@ import ( "strconv" "strings" - "maunium.net/go/gomuks/matrix/rooms" - "maunium.net/go/gomuks/ui/widget" "maunium.net/go/tcell" "maunium.net/go/tview" + + "maunium.net/go/gomuks/matrix/rooms" + "maunium.net/go/gomuks/ui/widget" ) type OrderedRoom struct { diff --git a/ui/ui.go b/ui/ui.go index b2662d7..5188278 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -1,26 +1,28 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui import ( - "maunium.net/go/gomuks/interface" + "os" + "maunium.net/go/tcell" "maunium.net/go/tview" - "os" + + "maunium.net/go/gomuks/interface" ) type View string diff --git a/ui/view-login.go b/ui/view-login.go index 3d42506..603899c 100644 --- a/ui/view-login.go +++ b/ui/view-login.go @@ -1,28 +1,29 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui import ( + "maunium.net/go/mautrix" + "maunium.net/go/tview" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/interface" "maunium.net/go/gomuks/ui/widget" - "maunium.net/go/mautrix" - "maunium.net/go/tview" ) type LoginView struct { diff --git a/ui/view-main.go b/ui/view-main.go index 96daf1b..254dc9f 100644 --- a/ui/view-main.go +++ b/ui/view-main.go @@ -1,32 +1,34 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package ui import ( + "bufio" "fmt" + "os" "time" "unicode" "github.com/kyokomi/emoji" - "bufio" - "os" - "maunium.net/go/mautrix" + "maunium.net/go/tcell" + "maunium.net/go/tview" + "maunium.net/go/gomuks/config" "maunium.net/go/gomuks/debug" "maunium.net/go/gomuks/interface" @@ -35,8 +37,6 @@ import ( "maunium.net/go/gomuks/matrix/rooms" "maunium.net/go/gomuks/ui/messages/parser" "maunium.net/go/gomuks/ui/widget" - "maunium.net/go/tcell" - "maunium.net/go/tview" ) type MainView struct { diff --git a/ui/widget/advanced-inputfield.go b/ui/widget/advanced-inputfield.go index 44d988b..741ae3d 100644 --- a/ui/widget/advanced-inputfield.go +++ b/ui/widget/advanced-inputfield.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . // Based on https://github.com/rivo/tview/blob/master/inputfield.go @@ -26,6 +26,7 @@ import ( "github.com/mattn/go-runewidth" "github.com/zyedidia/clipboard" + "maunium.net/go/tcell" "maunium.net/go/tview" ) diff --git a/ui/widget/border.go b/ui/widget/border.go index 834eedb..8ec772d 100644 --- a/ui/widget/border.go +++ b/ui/widget/border.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package widget diff --git a/ui/widget/center.go b/ui/widget/center.go index 07dbfd7..cc994bb 100644 --- a/ui/widget/center.go +++ b/ui/widget/center.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package widget diff --git a/ui/widget/color.go b/ui/widget/color.go index 37a931a..a121731 100644 --- a/ui/widget/color.go +++ b/ui/widget/color.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package widget diff --git a/ui/widget/form-text-view.go b/ui/widget/form-text-view.go index 207bdde..2a8683c 100644 --- a/ui/widget/form-text-view.go +++ b/ui/widget/form-text-view.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package widget diff --git a/ui/widget/util.go b/ui/widget/util.go index cd1fcd0..ed51735 100644 --- a/ui/widget/util.go +++ b/ui/widget/util.go @@ -1,18 +1,18 @@ // gomuks - A terminal Matrix client written in Go. -// Copyright (C) 2018 Tulir Asokan +// Copyright (C) 2019 Tulir Asokan // // This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by +// it under the terms of the GNU Affero General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// GNU Affero General Public License for more details. // -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . package widget