From 477e1ba2977435ae7bb75c7dbd95cf28247f89bd Mon Sep 17 00:00:00 2001 From: nirav Date: Thu, 28 Mar 2019 09:10:52 +0530 Subject: Move APIs into libgs dir --- Makefile | 57 ++-- libgs/LICENSE | 675 ++++++++++++++++++++++++++++++++++++++++++++++ libgs/Makefile | 48 ++++ libgs/src/account.c | 93 +++++++ libgs/src/account.h | 30 +++ libgs/src/app.c | 115 ++++++++ libgs/src/app.h | 13 + libgs/src/auth.c | 109 ++++++++ libgs/src/auth.h | 12 + libgs/src/client.c | 72 +++++ libgs/src/client.h | 29 ++ libgs/src/config.c | 174 ++++++++++++ libgs/src/config.h | 28 ++ libgs/src/gs.c | 13 + libgs/src/gs.h | 17 ++ libgs/src/http.c | 178 ++++++++++++ libgs/src/http.h | 9 + libgs/src/instance_info.c | 38 +++ libgs/src/instance_info.h | 31 +++ libgs/src/log.c | 30 +++ libgs/src/log.h | 13 + libgs/src/status.c | 120 +++++++++ libgs/src/status.h | 31 +++ libgs/src/string-util.c | 86 ++++++ libgs/src/string-util.h | 10 + libgs/src/timeline.c | 93 +++++++ libgs/src/timeline.h | 17 ++ src/account.c | 92 ------- src/account.h | 29 -- src/auth.c | 146 ---------- src/auth.h | 9 - src/config.c | 14 +- src/http.c | 178 ------------ src/http.h | 10 - src/instance_info.c | 38 --- src/instance_info.h | 31 --- src/log.c | 3 +- src/log.h | 3 +- src/login_window.c | 48 ++-- src/login_window.h | 4 +- src/main.c | 26 +- src/main_window.c | 26 +- src/register.c | 128 --------- src/register.h | 8 - src/status.c | 120 --------- src/status.h | 31 --- src/string-util.c | 123 --------- src/string-util.h | 10 - src/timeline.c | 118 -------- src/timeline.h | 16 -- 50 files changed, 2174 insertions(+), 1178 deletions(-) create mode 100644 libgs/LICENSE create mode 100644 libgs/Makefile create mode 100644 libgs/src/account.c create mode 100644 libgs/src/account.h create mode 100644 libgs/src/app.c create mode 100644 libgs/src/app.h create mode 100644 libgs/src/auth.c create mode 100644 libgs/src/auth.h create mode 100644 libgs/src/client.c create mode 100644 libgs/src/client.h create mode 100644 libgs/src/config.c create mode 100644 libgs/src/config.h create mode 100644 libgs/src/gs.c create mode 100644 libgs/src/gs.h create mode 100644 libgs/src/http.c create mode 100644 libgs/src/http.h create mode 100644 libgs/src/instance_info.c create mode 100644 libgs/src/instance_info.h create mode 100644 libgs/src/log.c create mode 100644 libgs/src/log.h create mode 100644 libgs/src/status.c create mode 100644 libgs/src/status.h create mode 100644 libgs/src/string-util.c create mode 100644 libgs/src/string-util.h create mode 100644 libgs/src/timeline.c create mode 100644 libgs/src/timeline.h delete mode 100644 src/account.c delete mode 100644 src/account.h delete mode 100644 src/auth.c delete mode 100644 src/auth.h delete mode 100644 src/http.c delete mode 100644 src/http.h delete mode 100644 src/instance_info.c delete mode 100644 src/instance_info.h delete mode 100644 src/register.c delete mode 100644 src/register.h delete mode 100644 src/status.c delete mode 100644 src/status.h delete mode 100644 src/string-util.c delete mode 100644 src/string-util.h delete mode 100644 src/timeline.c delete mode 100644 src/timeline.h diff --git a/Makefile b/Makefile index 781f0aa..435c451 100644 --- a/Makefile +++ b/Makefile @@ -1,34 +1,31 @@ .POSIX: -CC=c99 + +CC=cc CFLAGS=-Wall -Wextra -Wno-unused-parameter -E_CGLAGS=$$(pkg-config --cflags gtk+-3.0 jansson libcurl) $(CFLAGS) +E_CGLAGS=$$(pkg-config --cflags gtk+-3.0 jansson libcurl) \ + -Ilibgs/src $(CFLAGS) LDFLAGS= -E_LDFLAGS=$$(pkg-config --libs gtk+-3.0 jansson libcurl) $(LDFLAGS) +E_LDFLAGS=$$(pkg-config --libs gtk+-3.0 jansson libcurl) \ + -Llibgs -lgs $(LDFLAGS) DESTDIR= PREFIX=/usr/local BINDIR=$(PREFIX)/bin OBJECTS=src/main.o \ - src/string-util.o \ - src/instance_info.o \ - src/http.o \ - src/status.o \ - src/account.o \ - src/timeline.o \ - src/auth.o \ - src/register.o \ src/login_window.o \ src/main_window.o \ src/config.o \ - src/log.o + src/log.o \ all: ap_client ap_client: $(OBJECTS) - $(CC) $(E_LDFLAGS) -o ap_client $(OBJECTS) + @echo $(CC) $(E_LDFLAGS) -o $@ $(OBJECTS) + @$(CC) $(E_LDFLAGS) -o $@ $(OBJECTS) .c.o: - $(CC) $(E_CGLAGS) -c -o $@ $< + @echo $(CC) $(E_CGLAGS) -c -o $@ $< + @$(CC) $(E_CGLAGS) -c -o $@ $< install: ap_client mkdir -p $(DESTDIR)$(BINDIR) @@ -42,23 +39,17 @@ clean: uninstall: rm -f $(DESTDIR)$(BINDIR)/ap_client -src/account.o: src/account.c src/account.h src/log.h -src/auth.o: src/auth.c src/string-util.h src/auth.h src/http.h \ - src/config.h src/log.h -src/config.o: src/config.c src/string-util.h src/config.h src/log.h -src/http.o: src/http.c src/string-util.h src/auth.h src/config.h \ - src/log.h -src/instance_info.o: src/instance_info.c src/instance_info.h src/log.h +src/config.o: src/config.c src/config.h src/log.h +src/log.o: src/log.c src/log.h +src/login_window.o: src/login_window.c src/main_window.h src/log.h +src/main.o: src/main.c src/config.h src/main_window.h +src/config.o: src/config.c src/config.h src/log.h +src/log.o: src/log.c src/log.h +src/login_window.o: src/login_window.c src/main_window.h src/log.h +src/main.o: src/main.c src/config.h src/main_window.h +src/config.o: src/config.c src/config.h src/log.h src/log.o: src/log.c src/log.h -src/login_window.o: src/login_window.c src/auth.h src/register.h \ - src/http.h src/timeline.h src/status.h src/account.h src/main_window.h \ - src/log.h -src/main.o: src/main.c src/http.h src/config.h src/main_window.h -src/main_window.o: src/main_window.c src/auth.h src/http.h src/timeline.h \ - src/status.h src/account.h src/log.h src/config.h src/login_window.h \ - src/string-util.h -src/register.o: src/register.c src/http.h src/config.h src/log.h -src/status.o: src/status.c src/status.h src/account.h src/log.h -src/string-util.o: src/string-util.c -src/timeline.o: src/timeline.c src/timeline.h src/status.h src/account.h \ - src/auth.h src/config.h src/http.h src/string-util.h src/log.h +src/login_window.o: src/login_window.c src/main_window.h src/log.h +src/main.o: src/main.c src/config.h src/main_window.h +src/main_window.o: src/main_window.c src/log.h src/config.h \ + src/login_window.h diff --git a/libgs/LICENSE b/libgs/LICENSE new file mode 100644 index 0000000..53d1f3d --- /dev/null +++ b/libgs/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + 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 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 +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. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +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. + + 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. + + 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. + + 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. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +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. + + 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 +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. + + 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 +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 +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 +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 +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +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 + 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. + + You should have received a copy of the GNU 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". + + 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 +. + diff --git a/libgs/Makefile b/libgs/Makefile new file mode 100644 index 0000000..8714519 --- /dev/null +++ b/libgs/Makefile @@ -0,0 +1,48 @@ +.POSIX: +CC=cc +CFLAGS=-pedantic -o2 -pipe -Wall -Wextra -Wno-unused-parameter -fPIC -shared +LDFLAGS=-lcurl -ljansson +TARGET=libgs.so + +OBJECTS=src/gs.o \ + src/app.o \ + src/account.o \ + src/auth.o \ + src/client.o \ + src/http.o \ + src/log.o \ + src/timeline.o \ + src/status.o \ + src/string-util.o + +all: $(TARGET) + +$(TARGET): $(OBJECTS) + $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS) + +.c.o: + $(CC) $(CFLAGS) -c -o $@ $< + +clean: + rm -f src/*.o + rm -f $(TARGET) + +src/account.o: src/account.c src/account.h src/log.h +src/app.o: src/app.c src/app.h src/http.h src/log.h +src/auth.o: src/auth.c src/auth.h src/client.h src/log.h \ + src/string-util.h +src/client.o: src/client.c src/client.h src/http.h src/log.h \ + src/string-util.h +src/config.o: src/config.c src/string-util.h src/config.h src/log.h +src/gs.o: src/gs.c src/gs.h src/app.h src/account.h src/auth.h \ + src/client.h src/http.h src/log.h src/string-util.h src/status.h \ + src/timeline.h +src/http.o: src/http.c src/string-util.h src/auth.h src/client.h \ + src/log.h +src/instance_info.o: src/instance_info.c src/instance_info.h src/log.h +src/log.o: src/log.c src/log.h +src/status.o: src/status.c src/status.h src/account.h src/log.h +src/string-util.o: src/string-util.c +src/timeline.o: src/timeline.c src/timeline.h src/status.h src/account.h \ + src/client.h src/auth.h src/config.h src/http.h src/string-util.h \ + src/log.h diff --git a/libgs/src/account.c b/libgs/src/account.c new file mode 100644 index 0000000..ecf3c28 --- /dev/null +++ b/libgs/src/account.c @@ -0,0 +1,93 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include "account.h" +#include "log.h" + +struct gs_account *gs_account_from_json(const char *json_data) +{ + struct gs_account *a; + json_t *root; + json_error_t error; + + root = json_loads(json_data, 0, &error); + if (!root) { + gs_log(GS_WARNING, "gs_account_from_json", + "json parse error: line %d: %s", error.line, error.text); + return NULL; + } + + a = gs_account_from_json_t(root); + json_decref(root); + return a; +} + +struct gs_account *gs_account_from_json_t(const json_t *root) +{ + struct gs_account *a; + if (!root) { + gs_log(GS_WARNING, "gs_account_from_json_t", "json data is null"); + return NULL; + } + + if (!json_is_object(root)) { + gs_log(GS_WARNING, "gs_account_from_json_t", + "json root is not object"); + return NULL; + } + + a = calloc(1, sizeof(struct gs_account)); + if (!a) { + err(1, "gs_account_from_json_t"); + return NULL; + } + + json_t *id = json_object_get(root, "id"); + if (json_is_string(id)) { + a->id = strdup(json_string_value(id)); + } + + json_t *username = json_object_get(root, "username"); + if (json_is_string(username)) { + a->username = strdup(json_string_value(username)); + } + + json_t *acct = json_object_get(root, "acct"); + if (json_is_string(acct)) { + a->acct = strdup(json_string_value(acct)); + } + + json_t *display_name = json_object_get(root, "display_name"); + if (json_is_string(display_name)) { + a->display_name = strdup(json_string_value(display_name)); + } + + return a; +} + +void gs_account_free(struct gs_account *a) +{ + if (a->id) + free(a->id); + if (a->username) + free(a->username); + if (a->acct) + free(a->acct); + if (a->display_name) + free(a->display_name); + if (a->note) + free(a->note); + if (a->url) + free(a->url); + if (a->avatar) + free(a->avatar); + if (a->avatar_static) + free(a->avatar_static); + if (a->header) + free(a->header); + if (a->header_static) + free(a->header_static); + free(a); +} + diff --git a/libgs/src/account.h b/libgs/src/account.h new file mode 100644 index 0000000..c9d36d2 --- /dev/null +++ b/libgs/src/account.h @@ -0,0 +1,30 @@ +#ifndef __GS_ACCOUNT_H +#define __GS_ACCOUNT_H + +#include +#include + +struct gs_account { + char *id; + char *username; + char *acct; + char *display_name; + bool locked; + unsigned int follower_count; + unsigned int following_count; + unsigned int statuses_count; + char *note; + char *url; + char *avatar; + char *avatar_static; + char *header; + char *header_static; + struct gs_account *moved; + bool bot; +}; + +struct gs_account *gs_account_from_json(const char *json_data); +struct gs_account *gs_account_from_json_t(const json_t *); +void gs_account_free(struct gs_account *); + +#endif diff --git a/libgs/src/app.c b/libgs/src/app.c new file mode 100644 index 0000000..b3f6e20 --- /dev/null +++ b/libgs/src/app.c @@ -0,0 +1,115 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include "app.h" +#include "http.h" +#include "log.h" + +#define CLIENT_NAME "ap_client" +#define REGISTER_URL "https://%s/api/v1/apps" + +static char *get_register_url(const char *domain) +{ + char *url; + size_t size; + + size = strlen(REGISTER_URL) + strlen(domain) - 1; + url = malloc(size); + if (!url) { + err(1, NULL); + return NULL; + } + + sprintf(url, REGISTER_URL, domain); + return url; +} + +static char *get_register_req() +{ + char *req; + json_t *json_root; + + json_root = json_pack_ex(NULL, 1, "{s:s, s:s, s:s}", "client_name", + CLIENT_NAME, "redirect_uris", "urn:ietf:wg:oauth:2.0:oob", "scopes", + "read write push"); + if (!json_root) { + return NULL; + } + + req = json_dumps(json_root, 0); + json_decref(json_root); + + return req; +} + +static struct gs_app *get_register_resp(const char *data) +{ + struct gs_app *resp; + json_t *json_root; + json_t *cid, *csec; + + json_root = json_loads(data, 0, NULL); + if (!json_root) { + return NULL; + } + + if (!json_is_object(json_root)) { + json_decref(json_root); + return NULL; + } + + cid = json_object_get(json_root, "client_id"); + csec = json_object_get(json_root, "client_secret"); + if (!json_is_string(cid) || !json_is_string(csec)) { + json_decref(json_root); + return NULL; + } + + resp = calloc(1, sizeof(struct gs_app)); + resp->client_id = strdup(json_string_value(cid)); + resp->client_secret = strdup(json_string_value(csec)); + + json_decref(json_root); + return resp; +} + +struct gs_app *gs_app_register(const char *domain) +{ + char *url, *req_data, *resp_data; + struct gs_app *resp; + + if (!domain || !*domain) { + gs_log(GS_WARNING, "gs_app_register", "invalid argument"); + return NULL; + } + + url = get_register_url(domain); + if (!url) { + gs_log(GS_WARNING, "gs_app_register", "invalid argument"); + return NULL; + } + + req_data = get_register_req(); + if (!req_data) { + free(url); + return NULL; + } + + resp_data = gs_http_post(url, NULL, req_data); + free(url); + free(req_data); + if (!resp_data) { + gs_log(GS_WARNING, "gs_app_register", "register request failed"); + return NULL; + } + + resp = get_register_resp(resp_data); + free(resp_data); + if (!resp) { + gs_log(GS_WARNING, "gs_app_register", "invalid response"); + return NULL; + } + + return resp; +} diff --git a/libgs/src/app.h b/libgs/src/app.h new file mode 100644 index 0000000..f7b6e8a --- /dev/null +++ b/libgs/src/app.h @@ -0,0 +1,13 @@ +#ifndef __GS_APP_H +#define __GS_APP_H + +struct gs_app { + char *client_id; + char *client_secret; +}; + +struct gs_app *gs_app_register(const char *domain); + +#endif + + diff --git a/libgs/src/auth.c b/libgs/src/auth.c new file mode 100644 index 0000000..88ab7b7 --- /dev/null +++ b/libgs/src/auth.c @@ -0,0 +1,109 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include "auth.h" +#include "client.h" +#include "log.h" +#include "string-util.h" + +struct login_response { + char *access_token; + char *scope; +}; + +static char *get_login_req(const char *client_id, const char *client_secret, + const char *email, const char *password) +{ + char *req; + json_t *json_root; + json_error_t error; + + json_root = json_pack_ex(&error, 1, "{s:s, s:s, s:s, s:s, s:s}", + "client_id", client_id, "client_secret", + client_secret, "grant_type", "password", "username", email, + "password", password); + if (!json_root) { + return NULL; + } + + req = json_dumps(json_root, 0); + json_decref(json_root); + + return req; +} + +static struct login_response *get_login_resp(char *data) +{ + struct login_response *resp; + json_t *json_root; + json_t *access_token, *scope; + + json_root = json_loads(data, 0, NULL); + if (!json_root) { + return NULL; + } + + if (!json_is_object(json_root)) { + json_decref(json_root); + return NULL; + } + + access_token = json_object_get(json_root, "access_token"); + scope = json_object_get(json_root, "scope"); + if (!json_is_string(access_token) || !json_is_string(scope)) { + json_decref(json_root); + return NULL; + } + + resp = calloc(1, sizeof(struct login_response)); + resp->access_token = strdup(json_string_value(access_token)); + resp->scope = strdup(json_string_value(scope)); + + json_decref(json_root); + return resp; +} + +int gs_auth_authenticate(GSClient *c, const char *email, const char *password) +{ + char *req_data, *resp_data; + struct login_response *resp; + + if (!email || !*email || !password || !*password) { + gs_log(GS_WARNING, "gs_auth_authenticate", "invalid argument"); + return -1; + } + + req_data = get_login_req(c->client_id, c->client_secret, email, password); + if (!req_data) { + gs_log(GS_WARNING, "gs_auth_authenticate", "invalid argument"); + return -1; + } + + resp_data = (char *)gs_client_do_api(c, 2, "/oauth/token", req_data); + free(req_data); + if (!resp_data) { + gs_log(GS_WARNING, "gs_auth_authenticate", "invalid response"); + return -1; + } + + resp = get_login_resp(resp_data); + free(resp_data); + if (!resp) { + gs_log(GS_WARNING, "gs_auth_authenticate", "invalid response"); + return -1; + } + + gs_client_set_token(c, resp->access_token); + + free(resp->access_token); + free(resp->scope); + free(resp); + + return 0; +} + +bool gs_auth_is_logged_in(GSClient *c) +{ + return c->access_token != NULL; +} diff --git a/libgs/src/auth.h b/libgs/src/auth.h new file mode 100644 index 0000000..431e0d7 --- /dev/null +++ b/libgs/src/auth.h @@ -0,0 +1,12 @@ +#ifndef __GS_AUTH_H +#define __GS_AUTH_H + +#include +#include "client.h" + +int gs_auth_authenticate(GSClient *c, const char *email, const char *password); +bool gs_auth_is_logged_in(GSClient *c); + + +#endif + diff --git a/libgs/src/client.c b/libgs/src/client.c new file mode 100644 index 0000000..7c0b62c --- /dev/null +++ b/libgs/src/client.c @@ -0,0 +1,72 @@ +#define _POSIX_C_SOURCE 200809L + +#include +#include +#include +#include +#include "client.h" +#include "http.h" +#include "log.h" +#include "string-util.h" + +GSClient *gs_client_new(const char *server, const char *client_id, + const char *client_secret) +{ + GSClient *c; + + c = calloc(1, sizeof(GSClient)); + if (!c) { + err(1, "gs_new_client"); + return NULL; + } + + c->server = strdup(server); + c->client_id = strdup(client_id); + c->client_secret = strdup(client_secret); + + return c; +} + +void *gs_client_do_api(GSClient *c, int method, const char *url, + const char *req) +{ + char *resp; + + size_t s = strlen(c->server) + strlen(url) + 1; + char full_url[s]; + strlcpy(full_url, c->server, s); + strlcat(full_url, url, s); + + switch (method) { + case 1: + resp = gs_http_get(full_url, c->access_token); + break; + case 2: + resp = gs_http_post(full_url, c->access_token, req); + break; + default: + gs_log(GS_WARNING, "gs_client_do_api", "invalid api method"); + return NULL; + } + + return resp; +} + +void gs_client_set_token(GSClient *c, const char *access_token) +{ + c->access_token = strdup(access_token); +} + +void gs_client_free(GSClient *c) +{ + if (!c) + return; + if (c->server) + free(c->server); + if (c->client_id) + free(c->client_id); + if (c->client_secret) + free(c->client_secret); + if (c->access_token) + free(c->access_token); +} diff --git a/libgs/src/client.h b/libgs/src/client.h new file mode 100644 index 0000000..d24b1ff --- /dev/null +++ b/libgs/src/client.h @@ -0,0 +1,29 @@ +#ifndef __GS_CLIENT_H +#define __GS_CLIENT_H + +typedef struct { + char *server; + char *client_id; + char *client_secret; + char *access_token; +} GSClient; + +/* + * Create new GSClient with server url, client_id and client_secret returned + * from gs_register call. + * It will add `http://` prefix to server if it doesn't exists. + */ +GSClient *gs_client_new(const char *server, const char *client_id, + const char *client_secret); + +/* Generic helper fuction to make http calls */ +void *gs_client_do_api(GSClient *c, int method, const char *url, + const char *req); + +/* Set user access_token */ +void gs_client_set_token(GSClient *c, const char *access_token); + +/* Free GSClient */ +void gs_client_free(GSClient *c); + +#endif diff --git a/libgs/src/config.c b/libgs/src/config.c new file mode 100644 index 0000000..167c9af --- /dev/null +++ b/libgs/src/config.c @@ -0,0 +1,174 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "string-util.h" +#include "config.h" +#include "log.h" + +#define CONFIG_PATH_SUFFIX "/.config/ap_client/config" + +struct config _config; +const struct config *config = (const struct config *)&_config; + +bool is_logged_in() +{ + if (!(config->access_token) || !*(config->access_token) || + !(config->instance_url) || !*(config->instance_url)) { + return false; + } + return true; +} + +const char *get_access_token() +{ + return (const char *)config->access_token; +} + +const char *get_instance_url() +{ + return (const char *)config->instance_url; +} + +bool is_registered() +{ + if (!(_config.client_id) || !*(_config.client_id) || + !(_config.client_secret) || !*(_config.client_secret) || + !(_config.instance_url) || !*(_config.instance_url)) { + return false; + } + return true; +} + +char *get_config_path() +{ + char *home = getenv("HOME"); + if (!home || !*home) { + return NULL; + } + char config_path[PATH_MAX]; + strlcpy(config_path, home, sizeof(config_path)); + strlcat(config_path, CONFIG_PATH_SUFFIX, sizeof(config_path)); + return strdup(config_path); +} + +void config_load() +{ + json_t *root; + json_error_t error; + + char *path = get_config_path(); + root = json_load_file(path, 0, &error); + if (!root) { + gs_log(GS_WARNING, "config_load", "json parse error: line %d: %s", + error.line, error.text); + free(path); + return; + } + free(path); + + if (!json_is_object(root)) { + gs_log(GS_WARNING, "config_load", "json root is not object"); + json_decref(root); + return; + } + + json_t *instance_url = json_object_get(root, "instance_url"); + if (json_is_string(instance_url)) { + _config.instance_url = strdup(json_string_value(instance_url)); + } + + json_t *client_id = json_object_get(root, "client_id"); + if (json_is_string(client_id)) { + _config.client_id = strdup(json_string_value(client_id)); + } + + json_t *client_secret = json_object_get(root, "client_secret"); + if (json_is_string(client_secret)) { + _config.client_secret = strdup(json_string_value(client_secret)); + } + + json_t *access_token = json_object_get(root, "access_token"); + if (json_is_string(access_token)) { + _config.access_token = strdup(json_string_value(access_token)); + } + + json_decref(root); +} + +int config_save() +{ + json_t *root; + json_error_t error; + + root = json_pack_ex(&error, 1, "{s:s, s:s, s:s, s:s}", "instance_url", + _config.instance_url, "client_id", _config.client_id, + "client_secret", _config.client_secret, "access_token", + _config.access_token); + + if (!root) { + gs_log(GS_WARNING, "register_app", "json pack error: line %d: %s", + error.line, error.text); + return -1; + } + + char *config_path = get_config_path(); + struct stat st; + char *dir = dirname(config_path); + if (stat(dir, &st)) { + if (mkdir(dir, S_IRWXU)) { + free(config_path); + gs_log(GS_WARNING, "config_save", "failed to create config dir"); + return -1; + } + } + free(config_path); + + if (json_dump_file(root, get_config_path(), 0)) { + gs_log(GS_WARNING, "config_save", "unable to save json"); + json_decref(root); + return -1; + } + + json_decref(root); + return 0; +} + +void config_set_client_id(const char *cid) +{ + _config.client_id = strdup(cid); +} + +void config_set_client_secret(const char *cs) +{ + _config.client_secret = strdup(cs); +} + +void config_set_instance_url(const char *iu) +{ + _config.instance_url = strdup(iu); +} + +void config_set_access_token(const char *a) +{ + _config.access_token = strdup(a); +} + +void config_cleanup() +{ + if (_config.client_id) + free(_config.client_id); + if (_config.client_secret) + free(_config.client_secret); + if (_config.instance_url) + free(_config.instance_url); + if (_config.access_token) + free(_config.access_token); +} diff --git a/libgs/src/config.h b/libgs/src/config.h new file mode 100644 index 0000000..dd1f38d --- /dev/null +++ b/libgs/src/config.h @@ -0,0 +1,28 @@ +#ifndef __GS_CONFIG_H +#define __GS_CONFIG_H + +#include + +struct gs_config { + char *instance_url; + char *client_id; + char *client_secret; + char *access_token; +}; + +extern const struct gs_config *config; + +bool gs_is_logged_in(); +const char* gs_get_access_token(); +const char* gs_get_instance_url(); +int gs_read_local_credentials(); +bool gs_is_registered(); +void gs_config_load(); +int gs_config_save(); +void gs_config_set_client_id(const char *cid); +void gs_config_set_client_secret(const char *cs); +void gs_config_set_instance_url(const char *iu); +void gs_config_set_access_token(const char *a); +void gs_config_cleanup(); + +#endif diff --git a/libgs/src/gs.c b/libgs/src/gs.c new file mode 100644 index 0000000..587de59 --- /dev/null +++ b/libgs/src/gs.c @@ -0,0 +1,13 @@ +#define _POSIX_C_SOURCE 200809L +#include "gs.h" +#include "http.h" + +int gs_init() +{ + return gs_http_init(); +} + +void gs_cleanup() +{ + gs_http_cleanup(); +} diff --git a/libgs/src/gs.h b/libgs/src/gs.h new file mode 100644 index 0000000..c69ca40 --- /dev/null +++ b/libgs/src/gs.h @@ -0,0 +1,17 @@ +#ifndef __GS_H +#define __GS_H + +#include "app.h" +#include "account.h" +#include "auth.h" +#include "client.h" +#include "http.h" +#include "log.h" +#include "string-util.h" +#include "status.h" +#include "timeline.h" + +int gs_init(); +void gs_cleanup(); + +#endif diff --git a/libgs/src/http.c b/libgs/src/http.c new file mode 100644 index 0000000..e1224ff --- /dev/null +++ b/libgs/src/http.c @@ -0,0 +1,178 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include +#include +#include "string-util.h" +#include "auth.h" +#include "client.h" +#include "log.h" + +#define BUFFER_SIZE (256 * 1024) +#define AUTH_HEADER_STR_PREFIX "Authorization: Bearer " + +int gs_http_init() +{ + if (curl_global_init(CURL_GLOBAL_ALL)) { + gs_log(GS_WARNING, "http_init", "failed to init curl"); + return -1; + } + return 0; +} + +void gs_http_cleanup() +{ + curl_global_cleanup(); + return; +} + +struct write_result { + char *data; + int pos; +}; + +static size_t write_response(void *ptr, size_t size, size_t nmemb, void *stream) +{ + struct write_result *result = (struct write_result *)stream; + + if (result->pos + size * nmemb >= BUFFER_SIZE - 1) { + gs_log(GS_WARNING, "write_response", "buffer too small"); + return 0; + } + + memcpy(result->data + result->pos, ptr, size * nmemb); + result->pos += size * nmemb; + + return size * nmemb; +} + +char *gs_http_get(const char *url, const char *token) +{ + CURL *curl = NULL; + CURLcode status; + struct curl_slist *headers = NULL; + char *data = NULL; + long code; + + curl = curl_easy_init(); + if (!curl) + goto error; + + data = malloc(BUFFER_SIZE); + if (!data) + goto error; + + struct write_result write_result = {.data = data, .pos = 0}; + + if (token) { + size_t s = strlen(AUTH_HEADER_STR_PREFIX) + strlen(token) + 1; + char auth_header_val[s]; + strlcpy(auth_header_val, AUTH_HEADER_STR_PREFIX, s); + strlcat(auth_header_val, token, s); + headers = curl_slist_append(headers, auth_header_val); + } + + curl_easy_setopt(curl, CURLOPT_URL, url); + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_response); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &write_result); + + status = curl_easy_perform(curl); + if (status) { + gs_log(GS_WARNING, "get_request", + "unable to request data from %s: %s", url, + curl_easy_strerror(status)); + goto error; + } + + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); + if (code != 200) { + gs_log(GS_WARNING, "get_request", "server responded with code %ld", + code); + goto error; + } + + data[write_result.pos] = '\0'; + + curl_slist_free_all(headers); + curl_easy_cleanup(curl); + return data; + +error: + if (data) + free(data); + if (headers) + curl_slist_free_all(headers); + if (curl) + curl_easy_cleanup(curl); + return NULL; +} + +char *gs_http_post(const char *url, const char *token, const char *post_data) +{ + CURL *curl = NULL; + CURLcode status; + struct curl_slist *headers = NULL; + char *data = NULL; + long code; + + curl = curl_easy_init(); + if (!curl) + goto error; + + data = malloc(BUFFER_SIZE); + if (!data) + goto error; + + struct write_result write_result = {.data = data, .pos = 0}; + + if (token) { + size_t s = strlen(AUTH_HEADER_STR_PREFIX) + strlen(token) + 1; + char auth_header_val[s]; + strlcpy(auth_header_val, AUTH_HEADER_STR_PREFIX, s); + strlcat(auth_header_val, token, s); + headers = curl_slist_append(headers, auth_header_val); + } + if (post_data) { + char *content_type_header_val = "Content-Type: application/json"; + headers = curl_slist_append(headers, content_type_header_val); + } + + curl_easy_setopt(curl, CURLOPT_URL, url); + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_response); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &write_result); + if (post_data) + curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post_data); + + status = curl_easy_perform(curl); + if (status) { + gs_log(GS_WARNING, "post_request", + "unable to request data from %s: %s", + url, curl_easy_strerror(status)); + goto error; + } + + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); + if (code != 200) { + gs_log(GS_WARNING, "post_request", "server responded with code %ld", + code); + goto error; + } + + data[write_result.pos] = '\0'; + + curl_slist_free_all(headers); + curl_easy_cleanup(curl); + return data; + +error: + if (data) + free(data); + if (headers) + curl_slist_free_all(headers); + if (curl) + curl_easy_cleanup(curl); + return NULL; +} diff --git a/libgs/src/http.h b/libgs/src/http.h new file mode 100644 index 0000000..a0d850d --- /dev/null +++ b/libgs/src/http.h @@ -0,0 +1,9 @@ +#ifndef __GS_HTTP_H +#define __GS_HTTP_H + +int gs_http_init(); +void gs_http_cleanup(); +char *gs_http_get(const char *url, const char *token); +char *gs_http_post(const char *url, const char *token, const char *data); + +#endif diff --git a/libgs/src/instance_info.c b/libgs/src/instance_info.c new file mode 100644 index 0000000..40f07c6 --- /dev/null +++ b/libgs/src/instance_info.c @@ -0,0 +1,38 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include "instance_info.h" +#include "log.h" + +struct instance_info *instance_info_from_json(char *json_data) +{ + struct instance_info *info; + info = malloc(sizeof(struct instance_info)); + + json_t *root; + json_error_t error; + + root = json_loads(json_data, 0, &error); + + if (!root) { + gs_log(GS_WARNING, "instance_info_from_json", "error: on line %d: %s", + error.line, error.text); + return NULL; + } + + if (!json_is_object(root)) { + gs_log(GS_WARNING, "instance_info_from_json", "root is not object"); + json_decref(root); + return NULL; + } + + json_t *title = json_object_get(root, "title"); + if (!json_is_string(title)) { + gs_log(GS_WARNING, "instance_info_from_json", "title is not string"); + return NULL; + } + info->title = strdup(json_string_value(title)); + + json_decref(root); + return info; +} diff --git a/libgs/src/instance_info.h b/libgs/src/instance_info.h new file mode 100644 index 0000000..cdb6e84 --- /dev/null +++ b/libgs/src/instance_info.h @@ -0,0 +1,31 @@ +#ifndef __GS_INSTANCE_INFO_H +#define __GS_INSTANCE_INFO_H + +#include + +struct instance_info_urls { + char *streaming_api; +}; + +struct instance_info_stats { + int user_count; + int status_count; + int domain_count; +}; + +struct instance_info { + char *url; + char *title; + char *description; + char *email; + char *version; + struct instance_info_urls urls; + struct instance_info_stats states; + char *thumbnail; + char **languages; + bool registrations; +}; + +struct instance_info *instance_info_from_json(char *json_data); + +#endif diff --git a/libgs/src/log.c b/libgs/src/log.c new file mode 100644 index 0000000..dad6d66 --- /dev/null +++ b/libgs/src/log.c @@ -0,0 +1,30 @@ +#include +#include +#include +#include "log.h" + +static const char *log_levels[] = { + "info", + "warning", + "error", + "fatal", +}; + +void gs_log(enum gs_log_level level, const char *namespace, + const char *format, ...) { + va_list args; + va_start(args, format); + + fprintf(stderr, "%s: %s: ", log_levels[level], namespace); + vfprintf(stderr, format, args); + fprintf(stderr, "\n"); + + if (level == GS_ERROR) { + exit(EXIT_FAILURE); + } else if (level == GS_FATAL) { + abort(); + } + + va_end(args); +} + diff --git a/libgs/src/log.h b/libgs/src/log.h new file mode 100644 index 0000000..83e3784 --- /dev/null +++ b/libgs/src/log.h @@ -0,0 +1,13 @@ +#ifndef __GS_LOG_H +#define __GS_LOG_H + +enum gs_log_level { + GS_INFO = 0, + GS_WARNING, + GS_ERROR, + GS_FATAL +}; + +void gs_log(enum gs_log_level level, const char *namespace, const char *format, ...); + +#endif diff --git a/libgs/src/status.c b/libgs/src/status.c new file mode 100644 index 0000000..5bcdb74 --- /dev/null +++ b/libgs/src/status.c @@ -0,0 +1,120 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include "status.h" +#include "account.h" +#include "log.h" + +struct gs_status *gs_status_from_json(const char *json_data) +{ + struct gs_status *s; + json_t *root; + json_error_t error; + + root = json_loads(json_data, 0, &error); + if (!root) { + gs_log(GS_WARNING, "status_from_json", + "json parse error: line %d: %s", error.line, error.text); + return NULL; + } + + s = gs_status_from_json_t(root); + json_decref(root); + return s; +} + +struct gs_status *gs_status_from_json_t(const json_t *root) +{ + struct gs_status *s; + if (!root) { + gs_log(GS_WARNING, "gs_status_from_json_t", "json data is null"); + return NULL; + } + + if (!json_is_object(root)) { + gs_log(GS_WARNING, "gs_status_from_json_t", "json root is not object"); + return NULL; + } + + s = calloc(1, sizeof(struct gs_status)); + if (!s) { + err(1, "gs_status_from_json_t"); + return NULL; + } + + json_t *id = json_object_get(root, "id"); + if (json_is_string(id)) { + s->id = strdup(json_string_value(id)); + } + + json_t *uri = json_object_get(root, "uri"); + if (json_is_string(uri)) { + s->uri = strdup(json_string_value(uri)); + } + + json_t *url = json_object_get(root, "url"); + if (json_is_string(url)) { + s->url = strdup(json_string_value(url)); + } + + json_t *account = json_object_get(root, "account"); + if (json_is_object(account)) { + s->account = gs_account_from_json_t(account); + } + + json_t *in_reply_to_id = json_object_get(root, "in_reply_to_id"); + if (json_is_string(in_reply_to_id)) { + s->in_reply_to_id = strdup(json_string_value(in_reply_to_id)); + } + + json_t *in_reply_to_account_id = + json_object_get(root, "in_reply_to_account_id"); + if (json_is_string(in_reply_to_account_id)) { + s->in_reply_to_account_id = + strdup(json_string_value(in_reply_to_account_id)); + } + + json_t *content = json_object_get(root, "content"); + if (json_is_string(content)) { + s->content = strdup(json_string_value(content)); + } + + json_t *replies_count = json_object_get(root, "replies_count"); + if (json_is_integer(replies_count)) { + s->replies_count = json_integer_value(replies_count); + } + + json_t *reblogs_count = json_object_get(root, "reblogs_count"); + if (json_is_integer(reblogs_count)) { + s->reblogs_count = json_integer_value(reblogs_count); + } + + json_t *favourites_count = json_object_get(root, "favourites_count"); + if (json_is_integer(favourites_count)) { + s->favourites_count = json_integer_value(favourites_count); + } + + return s; +} + +void gs_status_free(struct gs_status *s) +{ + if (s->id) + free(s->id); + if (s->uri) + free(s->uri); + if (s->url) + free(s->url); + if (s->account) + gs_account_free(s->account); + if (s->in_reply_to_id) + free(s->in_reply_to_id); + if (s->in_reply_to_account_id) + free(s->in_reply_to_account_id); + if (s->reblog) + gs_status_free(s->reblog); + if (s->content) + free(s->content); + free(s); +} diff --git a/libgs/src/status.h b/libgs/src/status.h new file mode 100644 index 0000000..431a027 --- /dev/null +++ b/libgs/src/status.h @@ -0,0 +1,31 @@ +#ifndef __GS_STATUS_H +#define __GS_STATUS_H + +#include +#include + +#include "account.h" + +struct gs_status { + char *id; + char *uri; + char *url; + struct gs_account *account; + char *in_reply_to_id; + char *in_reply_to_account_id; + struct gs_status *reblog; + char *content; + unsigned int replies_count; + unsigned int reblogs_count; + unsigned int favourites_count; + bool reblogged; + bool favourited; + bool muted; + bool sensitive; +}; + +struct gs_status *gs_status_from_json(const char *); +struct gs_status *gs_status_from_json_t(const json_t *); +void gs_status_free(struct gs_status *); + +#endif diff --git a/libgs/src/string-util.c b/libgs/src/string-util.c new file mode 100644 index 0000000..7f151ae --- /dev/null +++ b/libgs/src/string-util.c @@ -0,0 +1,86 @@ +/* $OpenBSD: src/lib/libc/string/strlcpy.c,v 1.11 2006/05/05 15:27:38 + * millert Exp $ */ + +/* + * Copyright (c) 1998 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include +#include + +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +size_t strlcpy(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + + /* Copy as many bytes as will fit */ + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } + } + + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return (s - src - 1); /* count does not include NUL */ +} + +/* + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ +size_t strlcat(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + size_t dlen; + + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = siz - dlen; + + if (n == 0) + return (dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + + return (dlen + (s - src)); /* count does not include NUL */ +} diff --git a/libgs/src/string-util.h b/libgs/src/string-util.h new file mode 100644 index 0000000..6acee6d --- /dev/null +++ b/libgs/src/string-util.h @@ -0,0 +1,10 @@ +#ifndef __GS_STRING_UTIL_H +#define __GS_STRING_UTIL_H + +#include + +size_t strlcpy(char *dst, const char *src, size_t siz); +size_t strlcat(char *dst, const char *src, size_t siz); +char *str_replace(const char *str, const char *old, const char *new); + +#endif diff --git a/libgs/src/timeline.c b/libgs/src/timeline.c new file mode 100644 index 0000000..fa0a2e8 --- /dev/null +++ b/libgs/src/timeline.c @@ -0,0 +1,93 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include +#include "timeline.h" +#include "auth.h" +#include "config.h" +#include "http.h" +#include "string-util.h" +#include "log.h" + +struct gs_timeline *gs_timeline_from_json(const char *json_data) +{ + struct gs_timeline *t; + json_t *root; + json_error_t error; + + root = json_loads(json_data, 0, &error); + if (!root) { + gs_log(GS_WARNING, "timeline_from_json", "json root it null"); + return NULL; + } + + if (!json_is_array(root)) { + gs_log(GS_WARNING, "timeline_from_json", "json root is not array"); + json_decref(root); + return NULL; + } + + t = calloc(1, sizeof(struct gs_timeline)); + if (!t) { + err(1, NULL); + json_decref(root); + return NULL; + } + + t->size = json_array_size(root); + t->statuses = calloc(t->size, sizeof(struct status *)); + if (!(t->statuses)) { + err(1, NULL); + gs_timeline_free(t); + json_decref(root); + return NULL; + } + + json_t *data; + for (size_t i = 0; i < t->size; i++) { + data = json_array_get(root, i); + if (!data) + goto error; + t->statuses[i] = gs_status_from_json_t(data); + if (!(t->statuses[i])) + goto error; + } + json_decref(root); + return t; + +error: + gs_timeline_free(t); + json_decref(root); + return NULL; +} + +void gs_timeline_free(struct gs_timeline *t) +{ + for (size_t i = 0; i < t->size; i++) { + if (t->statuses[i]) + gs_status_free(t->statuses[i]); + } + free(t->statuses); + free(t); +} + +struct gs_timeline *gs_timeline_get(GSClient *c, const char *max_id, + const char *since_id, const char *min_id, int limit) +{ + char *resp; + struct gs_timeline *t; + + resp = (char *)gs_client_do_api(c, 1, "/api/v1/timelines/home", NULL); + if (!resp) { + return NULL; + } + + t = gs_timeline_from_json(resp); + free(resp); + if (!t) { + return NULL; + } + + return t; +} diff --git a/libgs/src/timeline.h b/libgs/src/timeline.h new file mode 100644 index 0000000..73f46bb --- /dev/null +++ b/libgs/src/timeline.h @@ -0,0 +1,17 @@ +#ifndef __GS_TIMELINE_H +#define __GS_TIMELINE_H + +#include "status.h" +#include "client.h" + +struct gs_timeline { + struct gs_status **statuses; + size_t size; +}; + +struct gs_timeline *gs_timeline_get(GSClient *c, const char *max_id, + const char *since_id, const char *min_id, int limit); +struct gs_timeline *gs_timeline_from_json(const char *); +void gs_timeline_free(struct gs_timeline *); + +#endif diff --git a/src/account.c b/src/account.c deleted file mode 100644 index c407d56..0000000 --- a/src/account.c +++ /dev/null @@ -1,92 +0,0 @@ -#define _POSIX_C_SOURCE 200809L -#include -#include -#include -#include "account.h" -#include "log.h" - -struct account *account_from_json(const char *json_data) -{ - struct account *a; - json_t *root; - json_error_t error; - - root = json_loads(json_data, 0, &error); - if (!root) { - log_msg(LOG_WARNING, "account_from_json", "json parse error: line %d: %s", - error.line, error.text); - return NULL; - } - - a = account_from_json_t(root); - json_decref(root); - return a; -} - -struct account *account_from_json_t(const json_t *root) -{ - struct account *a; - if (!root) { - log_msg(LOG_WARNING, "account_from_json_t", "json data is null"); - return NULL; - } - - if (!json_is_object(root)) { - log_msg(LOG_WARNING, "account_from_json_t", "json root is not object"); - return NULL; - } - - a = calloc(1, sizeof(struct account)); - if (!a) { - err(1, "account_from_json_t"); - return NULL; - } - - json_t *id = json_object_get(root, "id"); - if (json_is_string(id)) { - a->id = strdup(json_string_value(id)); - } - - json_t *username = json_object_get(root, "username"); - if (json_is_string(username)) { - a->username = strdup(json_string_value(username)); - } - - json_t *acct = json_object_get(root, "acct"); - if (json_is_string(acct)) { - a->acct = strdup(json_string_value(acct)); - } - - json_t *display_name = json_object_get(root, "display_name"); - if (json_is_string(display_name)) { - a->display_name = strdup(json_string_value(display_name)); - } - - return a; -} - -void account_free(struct account *a) -{ - if (a->id) - free(a->id); - if (a->username) - free(a->username); - if (a->acct) - free(a->acct); - if (a->display_name) - free(a->display_name); - if (a->note) - free(a->note); - if (a->url) - free(a->url); - if (a->avatar) - free(a->avatar); - if (a->avatar_static) - free(a->avatar_static); - if (a->header) - free(a->header); - if (a->header_static) - free(a->header_static); - free(a); -} - diff --git a/src/account.h b/src/account.h deleted file mode 100644 index 547f276..0000000 --- a/src/account.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __account_H -#define __account_H - -#include - -struct account { - char *id; - char *username; - char *acct; - char *display_name; - bool locked; - unsigned int follower_count; - unsigned int following_count; - unsigned int statuses_count; - char *note; - char *url; - char *avatar; - char *avatar_static; - char *header; - char *header_static; - struct account *moved; - bool bot; -}; - -struct account *account_from_json(const char *json_data); -struct account *account_from_json_t(const json_t *); -void account_free(struct account *); - -#endif diff --git a/src/auth.c b/src/auth.c deleted file mode 100644 index c903e67..0000000 --- a/src/auth.c +++ /dev/null @@ -1,146 +0,0 @@ -#define _POSIX_C_SOURCE 200809L -#include -#include -#include -#include -#include -#include "string-util.h" -#include "auth.h" -#include "http.h" -#include "config.h" -#include "log.h" - -#define LOGIN_URL "https://%s/oauth/token" - -struct login_response { - char *access_token; - char *scope; -}; - -static char *get_login_url(const char *domain) -{ - char *url; - size_t size; - - size = strlen(LOGIN_URL) + strlen(domain) - 1; - url = malloc(size); - if (!url) { - err(1, NULL); - return NULL; - } - - sprintf(url, LOGIN_URL, domain); - return url; -} - -static char *get_login_req(const char *email, const char *password) -{ - char *req; - json_t *json_root; - json_error_t error; - - json_root = json_pack_ex(&error, 1, "{s:s, s:s, s:s, s:s, s:s}", - "client_id", config->client_id, "client_secret", - config->client_secret, "grant_type", "password", "username", email, - "password", password); - if (!json_root) { - return NULL; - } - - req = json_dumps(json_root, 0); - json_decref(json_root); - - return req; -} - -static struct login_response *get_login_resp(char *data) -{ - struct login_response *resp; - json_t *json_root; - json_t *access_token, *scope; - - json_root = json_loads(data, 0, NULL); - if (!json_root) { - return NULL; - } - - if (!json_is_object(json_root)) { - json_decref(json_root); - return NULL; - } - - access_token = json_object_get(json_root, "access_token"); - scope = json_object_get(json_root, "scope"); - if (!json_is_string(access_token) || !json_is_string(scope)) { - json_decref(json_root); - return NULL; - } - - resp = calloc(1, sizeof(struct login_response)); - resp->access_token = strdup(json_string_value(access_token)); - resp->scope = strdup(json_string_value(scope)); - - json_decref(json_root); - return resp; -} - -int login(const char *email, const char *password) -{ - char *url, *req_data, *resp_data; - struct login_response *resp; - - if (!email || !*email || !password || !*password) { - log_msg(LOG_WARNING, "login", "invalid argument"); - return -1; - } - - if (!is_registered()) { - log_msg(LOG_WARNING, "login", "app not registred"); - return -1; - } - - url = get_login_url(config->instance_url); - if (!url) { - err(1, NULL); - return -1; - } - - req_data = get_login_req(email, password); - if (!req_data) { - free(url); - return -1; - } - - resp_data = post_request(url, req_data); - free(url); - free(req_data); - if (!resp_data) { - log_msg(LOG_WARNING, "register_app", "login request failed"); - return -1; - } - - if (!resp_data) { - log_msg(LOG_WARNING, "register_app", "invalid response"); - return -1; - } - - resp = get_login_resp(resp_data); - free(resp_data); - if (!resp) { - log_msg(LOG_WARNING, "register_app", "invalid response"); - return -1; - } - - config_set_access_token(resp->access_token); - /* scope = strdup(json_string_value(scope_j)); */ - - if (config_save()) { - log_msg(LOG_WARNING, "login_call", "failed to save config"); - } - - free(resp->access_token); - free(resp->scope); - free(resp); - - return 0; -} diff --git a/src/auth.h b/src/auth.h deleted file mode 100644 index 9c3ee03..0000000 --- a/src/auth.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __AUTH_H -#define __AUTH_H - -#include - -int login(const char *email, const char *password); - -#endif - diff --git a/src/config.c b/src/config.c index f409700..24e3b54 100644 --- a/src/config.c +++ b/src/config.c @@ -1,15 +1,15 @@ #define _POSIX_C_SOURCE 200809L +#include +#include #include -#include #include -#include +#include #include #include #include -#include -#include +#include +#include #include -#include "string-util.h" #include "config.h" #include "log.h" @@ -54,8 +54,8 @@ char *get_config_path() return NULL; } char config_path[PATH_MAX]; - strlcpy(config_path, home, sizeof(config_path)); - strlcat(config_path, CONFIG_PATH_SUFFIX, sizeof(config_path)); + g_strlcpy(config_path, home, sizeof(config_path)); + g_strlcat(config_path, CONFIG_PATH_SUFFIX, sizeof(config_path)); return strdup(config_path); } diff --git a/src/http.c b/src/http.c deleted file mode 100644 index ddd0470..0000000 --- a/src/http.c +++ /dev/null @@ -1,178 +0,0 @@ -#define _POSIX_C_SOURCE 200809L -#include -#include -#include -#include -#include -#include "string-util.h" -#include "auth.h" -#include "config.h" -#include "log.h" - -#define BUFFER_SIZE (256 * 1024) -#define AUTH_HEADER_STR_PREFIX "Authorization: Bearer " - -int http_init() -{ - if (curl_global_init(CURL_GLOBAL_ALL)) { - log_msg(LOG_WARNING, "http_init", "failed to init curl"); - return -1; - } - return 0; -} - -void http_cleanup() -{ - curl_global_cleanup(); - return; -} - -struct write_result { - char *data; - int pos; -}; - -static size_t write_response(void *ptr, size_t size, size_t nmemb, void *stream) -{ - struct write_result *result = (struct write_result *)stream; - - if (result->pos + size * nmemb >= BUFFER_SIZE - 1) { - log_msg(LOG_WARNING, "write_response", "buffer too small"); - return 0; - } - - memcpy(result->data + result->pos, ptr, size * nmemb); - result->pos += size * nmemb; - - return size * nmemb; -} - -char *get_request(const char *url) -{ - CURL *curl = NULL; - CURLcode status; - struct curl_slist *headers = NULL; - char *data = NULL; - long code; - - curl = curl_easy_init(); - if (!curl) - goto error; - - data = malloc(BUFFER_SIZE); - if (!data) - goto error; - - struct write_result write_result = {.data = data, .pos = 0}; - - if (is_logged_in()) { - const char *token = get_access_token(); - size_t s = strlen(AUTH_HEADER_STR_PREFIX) + strlen(token) + 1; - char *auth_header_val = malloc(s); - strlcpy(auth_header_val, AUTH_HEADER_STR_PREFIX, s); - strlcat(auth_header_val, token, s); - headers = curl_slist_append(headers, auth_header_val); - } - - curl_easy_setopt(curl, CURLOPT_URL, url); - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_response); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, &write_result); - - status = curl_easy_perform(curl); - if (status) { - log_msg(LOG_WARNING, "get_request", - "unable to request data from %s: %s", url, - curl_easy_strerror(status)); - goto error; - } - - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); - if (code != 200) { - log_msg(LOG_WARNING, "get_request", "server responded with code %ld", - code); - goto error; - } - - data[write_result.pos] = '\0'; - - curl_slist_free_all(headers); - curl_easy_cleanup(curl); - return data; - -error: - if (data) - free(data); - if (headers) - curl_slist_free_all(headers); - if (curl) - curl_easy_cleanup(curl); - return NULL; -} - -char *post_request(const char *url, char *post_data) -{ - CURL *curl = NULL; - CURLcode status; - struct curl_slist *headers = NULL; - char *data = NULL; - long code; - - curl = curl_easy_init(); - if (!curl) - goto error; - - data = malloc(BUFFER_SIZE); - if (!data) - goto error; - - struct write_result write_result = {.data = data, .pos = 0}; - - if (is_logged_in()) { - const char *token = get_access_token(); - size_t s = strlen(AUTH_HEADER_STR_PREFIX) + strlen(token) + 1; - char *auth_header_val = malloc(s); - strlcpy(auth_header_val, AUTH_HEADER_STR_PREFIX, s); - strlcat(auth_header_val, token, s); - headers = curl_slist_append(headers, auth_header_val); - } - if (post_data) { - char *content_type_header_val = "Content-Type: application/json"; - headers = curl_slist_append(headers, content_type_header_val); - } - - curl_easy_setopt(curl, CURLOPT_URL, url); - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_response); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, &write_result); - if (post_data) - curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post_data); - - status = curl_easy_perform(curl); - if (status) { - log_msg(LOG_WARNING, "post_request", "unable to request data from %s: %s", - url, curl_easy_strerror(status)); - goto error; - } - - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); - if (code != 200) { - log_msg(LOG_WARNING, "post_request", "server responded with code %ld", code); - goto error; - } - - data[write_result.pos] = '\0'; - - curl_slist_free_all(headers); - curl_easy_cleanup(curl); - return data; - -error: - if (data) - free(data); - if (headers) - curl_slist_free_all(headers); - if (curl) - curl_easy_cleanup(curl); - return NULL; -} diff --git a/src/http.h b/src/http.h deleted file mode 100644 index 8e69b55..0000000 --- a/src/http.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __HTTP_H -#define __HTTP_H - -int http_init(); -void http_cleanup(); -char *get_request(const char *url); -char *post_request(const char *url, char *data); -/* int http_post_async(char *url, char *post_data, void (*callback)(char *)); */ - -#endif diff --git a/src/instance_info.c b/src/instance_info.c deleted file mode 100644 index 3c13ebd..0000000 --- a/src/instance_info.c +++ /dev/null @@ -1,38 +0,0 @@ -#define _POSIX_C_SOURCE 200809L -#include -#include -#include "instance_info.h" -#include "log.h" - -struct instance_info *instance_info_from_json(char *json_data) -{ - struct instance_info *info; - info = malloc(sizeof(struct instance_info)); - - json_t *root; - json_error_t error; - - root = json_loads(json_data, 0, &error); - - if (!root) { - log_msg(LOG_WARNING, "instance_info_from_json", "error: on line %d: %s", - error.line, error.text); - return NULL; - } - - if (!json_is_object(root)) { - log_msg(LOG_WARNING, "instance_info_from_json", "root is not object"); - json_decref(root); - return NULL; - } - - json_t *title = json_object_get(root, "title"); - if (!json_is_string(title)) { - log_msg(LOG_WARNING, "instance_info_from_json", "title is not string"); - return NULL; - } - info->title = strdup(json_string_value(title)); - - json_decref(root); - return info; -} diff --git a/src/instance_info.h b/src/instance_info.h deleted file mode 100644 index 72a5bbb..0000000 --- a/src/instance_info.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef __INSTANCE_INFO_H -#define __INSTANCE_INFO_H - -#include - -struct instance_info_urls { - char *streaming_api; -}; - -struct instance_info_stats { - int user_count; - int status_count; - int domain_count; -}; - -struct instance_info { - char *url; - char *title; - char *description; - char *email; - char *version; - struct instance_info_urls urls; - struct instance_info_stats states; - char *thumbnail; - char **languages; - bool registrations; -}; - -struct instance_info *instance_info_from_json(char *json_data); - -#endif diff --git a/src/log.c b/src/log.c index f1cb7d5..6aff619 100644 --- a/src/log.c +++ b/src/log.c @@ -10,7 +10,8 @@ static const char *log_levels[] = { "fatal", }; -void log_msg(enum log_level level, const char *namespace, const char *format, ...) { +void log_msg(enum log_level level, const char *namespace, + const char *format, ...) { va_list args; va_start(args, format); diff --git a/src/log.h b/src/log.h index ecd3428..f38be7a 100644 --- a/src/log.h +++ b/src/log.h @@ -8,6 +8,7 @@ enum log_level { LOG_FATAL }; -void log_msg(enum log_level level, const char *namespace, const char *format, ...); +void log_msg(enum log_level level, const char *namespace, + const char *format, ...); #endif diff --git a/src/login_window.c b/src/login_window.c index 241ca9b..54f7174 100644 --- a/src/login_window.c +++ b/src/login_window.c @@ -1,16 +1,13 @@ #define _POSIX_C_SOURCE 200809L -#include +#include #include #include -#include #include -#include "auth.h" -#include "register.h" -#include "http.h" -#include "timeline.h" +#include #include "main_window.h" #include "log.h" +static GSClient *gs_client = NULL; GtkApplication *application; GObject *login_dialog; GObject *instance_domain_entry, *email_entry, *password_entry; @@ -19,39 +16,40 @@ GObject *spinner; static gboolean login_completed(gpointer data) { - int *val_ptr = data; gtk_spinner_stop(GTK_SPINNER(spinner)); - if (*val_ptr) { - free(val_ptr); - log_msg(LOG_WARNING, "login_callback", "login failed"); - return G_SOURCE_REMOVE; - } else { - free(val_ptr); - gtk_widget_destroy(GTK_WIDGET(login_dialog)); - return G_SOURCE_REMOVE; - } + gtk_widget_destroy(GTK_WIDGET(login_dialog)); + return G_SOURCE_REMOVE; +} + +static gboolean login_failed(gpointer data) +{ + gtk_spinner_stop(GTK_SPINNER(spinner)); + return G_SOURCE_REMOVE; } static gpointer user_register(gpointer data) { - int *val_ptr; const char *instance_name, *email, *password; + struct gs_app *app; instance_name = gtk_entry_get_text(GTK_ENTRY(instance_domain_entry)); email = gtk_entry_get_text(GTK_ENTRY(email_entry)); password = gtk_entry_get_text(GTK_ENTRY(password_entry)); - val_ptr = malloc(sizeof(int)); - *val_ptr = register_app(instance_name); + app = gs_app_register(instance_name); if (*val_ptr) { log_msg(LOG_WARNING, "user_register", "registration failed"); } - *val_ptr = login(email, password); - if (*val_ptr) { + + gs_client = gs_client_new(instance_name, app->client_id, app->client_secret); + + if (gs_auth_authenticate(gs_client, email, password)) { log_msg(LOG_WARNING, "user_register", "login failed"); + gdk_threads_add_idle(login_failed, NULL); + return; } - gdk_threads_add_idle(login_completed, val_ptr); + gdk_threads_add_idle(login_completed, NULL); return NULL; } @@ -73,7 +71,6 @@ static bool is_form_valid() static void login_button_click(GtkButton *button, gpointer user_data) { - g_print("clicked\n"); if (is_form_valid()) submit_login_form(); } @@ -92,14 +89,15 @@ static void login_form_changed(GtkWidget *widget, gpointer data) gtk_widget_set_sensitive(GTK_WIDGET(login_button), false); } -int create_login_dialog() +int create_login_dialog(gpointer data) { GtkBuilder *login_builder; login_builder = gtk_builder_new_from_file("data/login_window.ui"); login_dialog = gtk_builder_get_object(login_builder, "login_dialog"); - instance_domain_entry = gtk_builder_get_object(login_builder, "instance_name"); + instance_domain_entry = gtk_builder_get_object(login_builder, + "instance_name"); g_signal_connect(G_OBJECT(instance_domain_entry), "changed", G_CALLBACK(login_form_changed), NULL); g_signal_connect(GTK_ENTRY(instance_domain_entry), "activate", diff --git a/src/login_window.h b/src/login_window.h index b3d299d..9243e46 100644 --- a/src/login_window.h +++ b/src/login_window.h @@ -1,7 +1,9 @@ #ifndef __LOGIN_WINDOW_H #define __LOGIN_WINDOW_H -int create_login_dialog(); +#include + +int create_login_dialog(gpointer data); #endif diff --git a/src/main.c b/src/main.c index 78968a3..9d8747e 100644 --- a/src/main.c +++ b/src/main.c @@ -1,24 +1,26 @@ #define _POSIX_C_SOURCE 200809L -#include #include #include #include #include -#include "http.h" +#include #include "config.h" #include "main_window.h" -static void startup(GtkApplication *app, gpointer user_data) +static void activate(GtkApplication *app, gpointer user_data) { + GSClient *gs_client; + config_load(); - if (http_init()) { - exit(EXIT_FAILURE); - } -} + if(gs_init()) + g_application_quit(G_APPLICATION(app)); -static void activate(GtkApplication *app, gpointer user_data) -{ - create_main_window(app, NULL); + gs_client = gs_client_new(config->instance_url, config->client_id, + config->client_secret); + if(!gs_client) + g_application_quit(G_APPLICATION(app)); + + create_main_window(app, gs_client); } int main(int argc, char **argv) @@ -27,12 +29,12 @@ int main(int argc, char **argv) int status; app = gtk_application_new("org.gtk.ap_client", G_APPLICATION_FLAGS_NONE); - g_signal_connect(app, "startup", G_CALLBACK(startup), NULL); g_signal_connect(app, "activate", G_CALLBACK(activate), NULL); status = g_application_run(G_APPLICATION(app), argc, argv); + g_object_unref(app); - http_cleanup(); config_cleanup(); + gs_cleanup(); return status; } diff --git a/src/main_window.c b/src/main_window.c index 048de51..bf1f50d 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -4,15 +4,13 @@ #include #include #include -#include "auth.h" -#include "http.h" -#include "timeline.h" +#include #include "log.h" #include "config.h" #include "login_window.h" -#include "string-util.h" static GtkWidget *window, *scrolled, *list_box; +static GSClient *gs_client = NULL; static gchar *html_to_pango(const char *content) { @@ -61,7 +59,7 @@ static gchar *html_to_pango(const char *content) static gboolean timeline_loaded(gpointer data) { - struct timeline *t = data; + struct gs_timeline *t = data; for (size_t i = 0; i < t->size; i++) { GtkBuilder *post_builder; GObject *post_box, *post_content_label; @@ -116,24 +114,28 @@ static gboolean timeline_loaded(gpointer data) gtk_widget_show_all(GTK_WIDGET(post_box)); } /* gtk_spinner_stop(GTK_SPINNER(spinner)); */ - timeline_free(t); + gs_timeline_free(t); return G_SOURCE_REMOVE; } static gpointer load_timeline(gpointer data) { - struct timeline *t; - t = get_timeline(NULL, NULL, NULL, 20); + struct gs_timeline *t; + + t = gs_timeline_get(gs_client, NULL, NULL, NULL, 20); if (!t) { log_msg(LOG_WARNING, "load_timeline", "failed"); return NULL; } + gdk_threads_add_idle(timeline_loaded, t); return NULL; } void create_main_window(GtkApplication *app, gpointer user_data) { + gs_client = user_data; + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_application(GTK_WINDOW(window), GTK_APPLICATION(app)); gtk_window_set_title(GTK_WINDOW(window), "ap_client"); @@ -156,12 +158,14 @@ void create_main_window(GtkApplication *app, gpointer user_data) gtk_container_add(GTK_CONTAINER(scrolled), list_box); gtk_widget_show_all(window); - if (!is_logged_in()) { + + if (!gs_auth_is_logged_in(client)) { create_login_dialog(); } - if (!is_logged_in()) { + if (!gs_auth_is_logged_in(client)) { log_msg(LOG_ERROR, "create_main_window", "login is required to view timeline"); } - g_thread_new("load_timeline_thread", &load_timeline, NULL); + + g_thread_new("load_timeline_thread", &load_timeline, client); } diff --git a/src/register.c b/src/register.c deleted file mode 100644 index 4885ec5..0000000 --- a/src/register.c +++ /dev/null @@ -1,128 +0,0 @@ -#define _POSIX_C_SOURCE 200809L -#include -#include -#include -#include -#include "http.h" -#include "config.h" -#include "log.h" - -#define CLIENT_NAME "ap_client" -#define REGISTER_URL "https://%s/api/v1/apps" - -struct register_response { - char *client_id; - char *client_secret; -}; - -static char *get_register_url(const char *domain) -{ - char *url; - size_t size; - - size = strlen(REGISTER_URL) + strlen(domain) - 1; - url = malloc(size); - if (!url) { - err(1, NULL); - return NULL; - } - - sprintf(url, REGISTER_URL, domain); - return url; -} - -static char *get_register_req() -{ - char *req; - json_t *json_root; - - json_root = json_pack_ex(NULL, 1, "{s:s, s:s, s:s}", "client_name", - CLIENT_NAME, "redirect_uris", "urn:ietf:wg:oauth:2.0:oob", "scopes", - "read write push"); - if (!json_root) { - return NULL; - } - - req = json_dumps(json_root, 0); - json_decref(json_root); - - return req; -} - -static struct register_response *get_register_resp(const char *data) -{ - struct register_response *resp; - json_t *json_root; - json_t *cid, *csec; - - json_root = json_loads(data, 0, NULL); - if (!json_root) { - return NULL; - } - - if (!json_is_object(json_root)) { - json_decref(json_root); - return NULL; - } - - cid = json_object_get(json_root, "client_id"); - csec = json_object_get(json_root, "client_secret"); - if (!json_is_string(cid) || !json_is_string(csec)) { - json_decref(json_root); - return NULL; - } - - resp = calloc(1, sizeof(struct register_response)); - resp->client_id = strdup(json_string_value(cid)); - resp->client_secret = strdup(json_string_value(csec)); - - json_decref(json_root); - return resp; -} - -int register_app(const char *domain) -{ - char *url, *req_data, *resp_data; - struct register_response *resp; - - if (!domain || !*domain) { - log_msg(LOG_WARNING, "register_app", "invalid argument"); - return -1; - } - - url = get_register_url(domain); - if (!url) { - return -1; - } - - req_data = get_register_req(); - if (!req_data) { - free(url); - return -1; - } - - resp_data = post_request(url, req_data); - free(url); - free(req_data); - if (!resp_data) { - log_msg(LOG_WARNING, "register_app", "register request failed"); - return -1; - } - - resp = get_register_resp(resp_data); - free(resp_data); - if (!resp) { - log_msg(LOG_WARNING, "register_app", "invalid response"); - return -1; - } - - config_set_client_id(resp->client_id); - config_set_client_secret(resp->client_secret); - config_set_instance_url(domain); - - free(resp->client_id); - free(resp->client_secret); - free(resp); - - return 0; -} diff --git a/src/register.h b/src/register.h deleted file mode 100644 index 2122d6b..0000000 --- a/src/register.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __REGISTER_H -#define __REGISTER_H - -int register_app(const char *domain); - -#endif - - diff --git a/src/status.c b/src/status.c deleted file mode 100644 index cfb3645..0000000 --- a/src/status.c +++ /dev/null @@ -1,120 +0,0 @@ -#define _POSIX_C_SOURCE 200809L -#include -#include -#include -#include "status.h" -#include "account.h" -#include "log.h" - -struct status *status_from_json(const char *json_data) -{ - struct status *s; - json_t *root; - json_error_t error; - - root = json_loads(json_data, 0, &error); - if (!root) { - log_msg(LOG_WARNING, "status_from_json", "json parse error: line %d: %s", - error.line, error.text); - return NULL; - } - - s = status_from_json_t(root); - json_decref(root); - return s; -} - -struct status *status_from_json_t(const json_t *root) -{ - struct status *s; - if (!root) { - log_msg(LOG_WARNING, "status_from_json_t", "json data is null"); - return NULL; - } - - if (!json_is_object(root)) { - log_msg(LOG_WARNING, "status_from_json_t", "json root is not object"); - return NULL; - } - - s = calloc(1, sizeof(struct status)); - if (!s) { - err(1, "status_from_json_t"); - return NULL; - } - - json_t *id = json_object_get(root, "id"); - if (json_is_string(id)) { - s->id = strdup(json_string_value(id)); - } - - json_t *uri = json_object_get(root, "uri"); - if (json_is_string(uri)) { - s->uri = strdup(json_string_value(uri)); - } - - json_t *url = json_object_get(root, "url"); - if (json_is_string(url)) { - s->url = strdup(json_string_value(url)); - } - - json_t *account = json_object_get(root, "account"); - if (json_is_object(account)) { - s->account = account_from_json_t(account); - } - - json_t *in_reply_to_id = json_object_get(root, "in_reply_to_id"); - if (json_is_string(in_reply_to_id)) { - s->in_reply_to_id = strdup(json_string_value(in_reply_to_id)); - } - - json_t *in_reply_to_account_id = - json_object_get(root, "in_reply_to_account_id"); - if (json_is_string(in_reply_to_account_id)) { - s->in_reply_to_account_id = - strdup(json_string_value(in_reply_to_account_id)); - } - - json_t *content = json_object_get(root, "content"); - if (json_is_string(content)) { - s->content = strdup(json_string_value(content)); - } - - json_t *replies_count = json_object_get(root, "replies_count"); - if (json_is_integer(replies_count)) { - s->replies_count = json_integer_value(replies_count); - } - - json_t *reblogs_count = json_object_get(root, "reblogs_count"); - if (json_is_integer(reblogs_count)) { - s->reblogs_count = json_integer_value(reblogs_count); - } - - json_t *favourites_count = json_object_get(root, "favourites_count"); - if (json_is_integer(favourites_count)) { - s->favourites_count = json_integer_value(favourites_count); - } - - return s; -} - -void status_free(struct status *s) -{ - if (s->id) - free(s->id); - if (s->uri) - free(s->uri); - if (s->url) - free(s->url); - if (s->account) - account_free(s->account); - if (s->in_reply_to_id) - free(s->in_reply_to_id); - if (s->in_reply_to_account_id) - free(s->in_reply_to_account_id); - if (s->reblog) - status_free(s->reblog); - if (s->content) - free(s->content); - free(s); -} diff --git a/src/status.h b/src/status.h deleted file mode 100644 index a065f50..0000000 --- a/src/status.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef __STATUS_H -#define __STATUS_H - -#include -#include - -#include "account.h" - -struct status { - char *id; - char *uri; - char *url; - struct account *account; - char *in_reply_to_id; - char *in_reply_to_account_id; - struct status *reblog; - char *content; - unsigned int replies_count; - unsigned int reblogs_count; - unsigned int favourites_count; - bool reblogged; - bool favourited; - bool muted; - bool sensitive; -}; - -struct status *status_from_json(const char *); -struct status *status_from_json_t(const json_t *); -void status_free(struct status *); - -#endif diff --git a/src/string-util.c b/src/string-util.c deleted file mode 100644 index d5a702b..0000000 --- a/src/string-util.c +++ /dev/null @@ -1,123 +0,0 @@ -/* $OpenBSD: src/lib/libc/string/strlcpy.c,v 1.11 2006/05/05 15:27:38 - * millert Exp $ */ - -/* - * Copyright (c) 1998 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include - -/* - * Copy src to string dst of size siz. At most siz-1 characters - * will be copied. Always NUL terminates (unless siz == 0). - * Returns strlen(src); if retval >= siz, truncation occurred. - */ -size_t strlcpy(char *dst, const char *src, size_t siz) -{ - char *d = dst; - const char *s = src; - size_t n = siz; - - /* Copy as many bytes as will fit */ - if (n != 0) { - while (--n != 0) { - if ((*d++ = *s++) == '\0') - break; - } - } - - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) { - if (siz != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++) - ; - } - - return (s - src - 1); /* count does not include NUL */ -} - -/* - * Appends src to string dst of size siz (unlike strncat, siz is the - * full size of dst, not space left). At most siz-1 characters - * will be copied. Always NUL terminates (unless siz <= strlen(dst)). - * Returns strlen(src) + MIN(siz, strlen(initial dst)). - * If retval >= siz, truncation occurred. - */ -size_t strlcat(char *dst, const char *src, size_t siz) -{ - char *d = dst; - const char *s = src; - size_t n = siz; - size_t dlen; - - /* Find the end of dst and adjust bytes left but don't go past end */ - while (n-- != 0 && *d != '\0') - d++; - dlen = d - dst; - n = siz - dlen; - - if (n == 0) - return (dlen + strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; - n--; - } - s++; - } - *d = '\0'; - - return (dlen + (s - src)); /* count does not include NUL */ -} - -char *str_replace(const char *str, const char *old, const char *new) -{ - const char *ins; - char *result, *tmp; - size_t len_old, len_new, len_front, len_result; - int count; - - if (!str || !old || !new) - return NULL; - len_old = strlen(old); - if (len_old == 0) - return NULL; - len_new = strlen(new); - - ins = str; - for (count = 0; (tmp = strstr(ins, old)); ++count) { - ins = tmp + len_old; - } - - len_result = strlen(str) + (len_new - len_old) * count + 1; - tmp = result = malloc(len_result); - if (!result) - return NULL; - - while (count--) { - ins = strstr(str, old); - len_front = ins - str; - tmp = strncpy(tmp, str, len_front) + len_front; - strlcpy(tmp, new, len_result); - tmp += len_new; - str += len_front + len_old; - } - strlcpy(tmp, str, len_result); - return result; -} - diff --git a/src/string-util.h b/src/string-util.h deleted file mode 100644 index 2625765..0000000 --- a/src/string-util.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __STRING_UTIL_H -#define __STRING_UTIL_H - -#include - -size_t strlcpy(char *dst, const char *src, size_t siz); -size_t strlcat(char *dst, const char *src, size_t siz); -char *str_replace(const char *str, const char *old, const char *new); - -#endif diff --git a/src/timeline.c b/src/timeline.c deleted file mode 100644 index 4cd9fe0..0000000 --- a/src/timeline.c +++ /dev/null @@ -1,118 +0,0 @@ -#define _POSIX_C_SOURCE 200809L -#include -#include -#include -#include -#include "timeline.h" -#include "auth.h" -#include "config.h" -#include "http.h" -#include "string-util.h" -#include "log.h" - -#define TIMELINE_URL "https://%s/api/v1/timelines/home" - -static char *get_timeline_url(const char *domain) -{ - char *url; - size_t size; - - size = strlen(TIMELINE_URL) + strlen(domain) - 1; - url = malloc(size); - if (!url) { - err(1, NULL); - return NULL; - } - - sprintf(url, TIMELINE_URL, domain); - return url; -} - -struct timeline *timeline_from_json(const char *json_data) -{ - struct timeline *t; - json_t *root; - json_error_t error; - - root = json_loads(json_data, 0, &error); - if (!root) { - log_msg(LOG_WARNING, "timeline_from_json", "json root it null"); - return NULL; - } - - if (!json_is_array(root)) { - log_msg(LOG_WARNING, "timeline_from_json", "json root is not array"); - json_decref(root); - return NULL; - } - - t = calloc(1, sizeof(struct timeline)); - if (!t) { - err(1, NULL); - json_decref(root); - return NULL; - } - - t->size = json_array_size(root); - t->statuses = calloc(t->size, sizeof(struct status *)); - if (!(t->statuses)) { - err(1, NULL); - timeline_free(t); - json_decref(root); - return NULL; - } - - json_t *data; - for (size_t i = 0; i < t->size; i++) { - data = json_array_get(root, i); - if (!data) - goto error; - t->statuses[i] = status_from_json_t(data); - if (!(t->statuses[i])) - goto error; - } - json_decref(root); - return t; - -error: - timeline_free(t); - json_decref(root); - return NULL; -} - -void timeline_free(struct timeline *t) -{ - for (size_t i = 0; i < t->size; i++) { - if (t->statuses[i]) - status_free(t->statuses[i]); - } - free(t->statuses); - free(t); -} - -struct timeline *get_timeline(const char *max_id, const char *since_id, const char *min_id, - int limit) -{ - char *url, *resp; - struct timeline *t; - - url = get_timeline_url(config->instance_url); - if (!url) { - err(1, "get_timeline"); - return NULL; - } - - resp = get_request(url); - free(url); - if (!resp) { - return NULL; - } - - t = timeline_from_json(resp); - free(resp); - if (!t) { - return NULL; - } - - return t; -} diff --git a/src/timeline.h b/src/timeline.h deleted file mode 100644 index 296bbe8..0000000 --- a/src/timeline.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __TIMELINE_H -#define __TIMELINE_H - -#include "status.h" - -struct timeline { - struct status **statuses; - size_t size; -}; - -struct timeline *timeline_from_json(const char *); -void timeline_free(struct timeline *); -struct timeline *get_timeline(const char *max_id, const char *since_id, const char *min_id, - int limit); - -#endif -- cgit v1.2.3